diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..4b56a90efe
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,32 @@
+---
+name: Feature request
+about: Suggest an enhancement to the product
+title: "[Feature Request]"
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is...
+
+**Is your request a feature not related to an existing problem? A new feature.**
+For example. 
+- Given I am using the nym wallet
+- When I transfer nym tokens across the network
+- Then I want to have an url link in the wallet which navigates outside the application to the nym-explorer
+
+**Where does the feature fit in the Nym real estate?**
+- Application / UI 
+
+**What is this solving?**
+How will this improve the product...
+
+**Is this an update to packages or libraries?**
+If so, please list them. If not, please ignore this section.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/report.md b/.github/ISSUE_TEMPLATE/report.md
new file mode 100644
index 0000000000..3dac5eb4f5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/report.md
@@ -0,0 +1,43 @@
+---
+name: Report
+about: To help identify and reproduce issues
+title: "[Issue]"
+labels: bug, bug-needs-triage, qa
+assignees: tommyv1987
+
+---
+
+**Describe the issue**
+A clear and concise description of what the issue is...
+
+**Expected behaviour**
+A clear and concise description of what you expected to happen...
+
+**Stack Traces**
+If there are stack traces or logs, please provide them here...
+
+**Steps to Reproduce**
+Steps to reproduce the behaviour, if you're familiar with BDD syntax, please write it in this style:
+- Given I was doing X
+- And I installed Y
+- When I actioned Y
+- Then I expect Z
+
+*An example:*
+- Given I was setting up a mix-node following the instructions in the docs
+- And I successfully bonded my node via the the wallet
+- When I went to start my mixnode
+- Then I was presented with an error
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem...
+
+**Which area of Nym were you using?**
+ - UI: [e.g. Websites - network-explorer, nym-website]
+ - Application: [e.g Gateway, Client, Wallet]
+ - OS: [e.g. Ubuntu 20.x, MacOs Big Sur, Windows 10]
+ - Browser: [e.g Chrome (if applicable)]
+ - Version: [e.g. nym binary(0.11.0), browser(94.0)]
+
+**Additional context**
+Please provide any other information
diff --git a/.github/workflows/nym-wallet-tests.yml b/.github/workflows/nym-wallet-tests.yml
deleted file mode 100644
index 8b13789179..0000000000
--- a/.github/workflows/nym-wallet-tests.yml
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/.github/workflows/nym_wallet.yml b/.github/workflows/nym_wallet.yml
index 58a093c66b..47864cd3e2 100644
--- a/.github/workflows/nym_wallet.yml
+++ b/.github/workflows/nym_wallet.yml
@@ -1,9 +1,10 @@
-name: webdriverio tests for nym wallet
+name: Webdriverio tests for nym wallet
 
 on: 
  push:
     paths:
-      - '/tauri-wallet/*'
+      - 'tauri-wallet/**'
+      
 defaults:
   run:
     working-directory: tauri-wallet
@@ -12,7 +13,6 @@ jobs:
   test:
     name: wallet tests
     runs-on: ubuntu-latest 
-
     steps:
       - uses: actions/checkout@v2
 
@@ -27,18 +27,44 @@ jobs:
           webkit2gtk-driver
           xvfb
 
+      - name: Install minimal stable
+        uses: actions-rs/toolchain@v1
+        with:
+         profile: minimal
+         toolchain: stable
+
       - name: Node v16
         uses: actions/setup-node@v1
         with:
           node-version: 16.x
 
+      - name: Install yarn for building application
+        run: yarn install    
+
       - name: Build application
         run: yarn run webpack:build & yarn run tauri:build
-        working-directory: tauri-wallet
+        
+      - name: Check binary exists
+        run: |
+             cd target/release/
+             (test -f nym-wallet && echo nym binary exists) || echo wallet does not exist
 
-      - name: Yarn install
+      - name: Install dependencies
         run: yarn install
-        working-directory: webdriver/
+        working-directory: tauri-wallet/webdriver
+
+      - name: Remove existing user datafile
+        uses: JesseTG/rm@v1.0.2
+        with:
+          path: tauri-wallet/webdriver/common/data/user-data.json
+
+      - name: Create user data json file
+        id: create-json
+        uses: jsdaniell/create-json@1.1.2
+        with:
+           name: "user-data.json"
+           json: ${{ secrets.WALLET_USERDATA }}
+           dir: 'tauri-wallet/webdriver/common/data/'
 
       - name: Install tauri-driver
         uses: actions-rs/cargo@v1
@@ -47,5 +73,5 @@ jobs:
           args: tauri-driver
 
       - name: Launch tests
-        run: xvfb-run yarn test:login
-        working-directory: webdriver/
+        run: xvfb-run yarn test:newuser
+        working-directory: tauri-wallet/webdriver
diff --git a/Cargo.lock b/Cargo.lock
index afe8a1a2e3..51efe09911 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -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,21 +228,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
-[[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"
@@ -864,9 +831,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",
@@ -875,9 +842,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",
@@ -888,6 +855,8 @@ dependencies = [
  "prost",
  "prost-types",
  "rand_core 0.6.3",
+ "serde",
+ "serde_json",
  "subtle-encoding",
  "tendermint",
  "tendermint-rpc",
@@ -1527,7 +1496,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4620d40f6d2601794401d6dd95a5cf69b6c157852539470eeda433a99b3c0efc"
 dependencies = [
- "serde",
  "signature",
 ]
 
@@ -1541,7 +1509,6 @@ dependencies = [
  "ed25519",
  "rand 0.7.3",
  "serde",
- "serde_bytes",
  "sha2",
  "zeroize",
 ]
@@ -1738,6 +1705,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"
@@ -2120,12 +2097,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"
@@ -2608,6 +2579,7 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "webpki",
+ "webpki-roots",
 ]
 
 [[package]]
@@ -2768,15 +2740,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"
@@ -3716,15 +3679,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"
@@ -3874,6 +3828,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"
@@ -3906,6 +3866,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"
@@ -4283,9 +4270,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",
@@ -4293,12 +4280,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",
@@ -4306,9 +4293,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",
@@ -4927,12 +4914,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"
@@ -5513,7 +5494,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",
 ]
@@ -5999,7 +5980,7 @@ dependencies = [
  "anyhow",
  "cfg-expr",
  "heck",
- "itertools 0.10.1",
+ "itertools",
  "pkg-config",
  "strum 0.21.0",
  "strum_macros 0.21.1",
@@ -6214,16 +6195,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",
@@ -6240,21 +6221,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",
@@ -6262,30 +6254,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",
@@ -6577,21 +6571,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"
@@ -6812,7 +6794,7 @@ dependencies = [
  "cosmrs",
  "cosmwasm-std",
  "flate2",
- "itertools 0.10.1",
+ "itertools",
  "log",
  "mixnet-contract",
  "network-defaults",
diff --git a/Cargo.toml b/Cargo.toml
index 49f75e91b9..cd74684817 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,6 +4,7 @@
 [profile.release]
 panic = "abort"
 opt-level = "s"
+overflow-checks = true
 
 [profile.dev]
 panic = "abort"
diff --git a/clients/client-core/src/client/topology_control.rs b/clients/client-core/src/client/topology_control.rs
index 0863e1e867..f8a9949776 100644
--- a/clients/client-core/src/client/topology_control.rs
+++ b/clients/client-core/src/client/topology_control.rs
@@ -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;
diff --git a/clients/native/Cargo.toml b/clients/native/Cargo.toml
index 3691af376a..5b63e59310 100644
--- a/clients/native/Cargo.toml
+++ b/clients/native/Cargo.toml
@@ -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
 
diff --git a/clients/socks5/Cargo.toml b/clients/socks5/Cargo.toml
index 9976db2ac7..a8c58b1a70 100644
--- a/clients/socks5/Cargo.toml
+++ b/clients/socks5/Cargo.toml
@@ -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"
diff --git a/clients/webassembly/Cargo.toml b/clients/webassembly/Cargo.toml
index b128e1a974..6386867f44 100644
--- a/clients/webassembly/Cargo.toml
+++ b/clients/webassembly/Cargo.toml
@@ -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"]
diff --git a/clients/webassembly/src/client/mod.rs b/clients/webassembly/src/client/mod.rs
index 66a1a3817b..2712f42d66 100644
--- a/clients/webassembly/src/client/mod.rs
+++ b/clients/webassembly/src/client/mod.rs
@@ -301,7 +301,7 @@ impl NymClient {
         };
 
         let gateways = match validator_client.get_cached_gateways().await {
-            Err(err) => panic!("{:?}", err),
+            Err(err) => panic!("{}", err),
             Ok(gateways) => gateways,
         };
 
diff --git a/common/client-libs/gateway-client/src/socket_state.rs b/common/client-libs/gateway-client/src/socket_state.rs
index 80b8085499..b82e9907b3 100644
--- a/common/client-libs/gateway-client/src/socket_state.rs
+++ b/common/client-libs/gateway-client/src/socket_state.rs
@@ -173,9 +173,9 @@ impl PartiallyDelegated {
         // this call failing is incredibly unlikely, but not impossible.
         // basically the gateway connection must have failed after executing previous line but
         // before starting execution of this one.
-        if notify.send(()).is_err() {
-            return Err(GatewayClientError::ConnectionAbruptlyClosed);
-        }
+        notify
+            .send(())
+            .map_err(|_| GatewayClientError::ConnectionAbruptlyClosed)?;
 
         let stream_results: Result<_, GatewayClientError> = stream_receiver
             .await
diff --git a/common/client-libs/validator-client/Cargo.toml b/common/client-libs/validator-client/Cargo.toml
index 78c7519e4f..11f4c14119 100644
--- a/common/client-libs/validator-client/Cargo.toml
+++ b/common/client-libs/validator-client/Cargo.toml
@@ -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 }
diff --git a/common/client-libs/validator-client/src/client.rs b/common/client-libs/validator-client/src/client.rs
index 48535ba7d8..0e2533b37d 100644
--- a/common/client-libs/validator-client/src/client.rs
+++ b/common/client-libs/validator-client/src/client.rs
@@ -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,
         })
@@ -339,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,
@@ -488,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?)
     }
diff --git a/common/client-libs/validator-client/src/nymd/cosmwasm_client/client.rs b/common/client-libs/validator-client/src/nymd/cosmwasm_client/client.rs
index 8bd8a0b207..7edbcb39ae 100644
--- a/common/client-libs/validator-client/src/nymd/cosmwasm_client/client.rs
+++ b/common/client-libs/validator-client/src/nymd/cosmwasm_client/client.rs
@@ -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
diff --git a/common/client-libs/validator-client/src/nymd/cosmwasm_client/signing_client.rs b/common/client-libs/validator-client/src/nymd/cosmwasm_client/signing_client.rs
index eebdbdf7fd..ab650b36c0 100644
--- a/common/client-libs/validator-client/src/nymd/cosmwasm_client/signing_client.rs
+++ b/common/client-libs/validator-client/src/nymd/cosmwasm_client/signing_client.rs
@@ -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,
     {
diff --git a/common/client-libs/validator-client/src/nymd/error.rs b/common/client-libs/validator-client/src/nymd/error.rs
index a9a709b955..e1e2e114fd 100644
--- a/common/client-libs/validator-client/src/nymd/error.rs
+++ b/common/client-libs/validator-client/src/nymd/error.rs
@@ -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
diff --git a/common/client-libs/validator-client/src/nymd/mod.rs b/common/client-libs/validator-client/src/nymd/mod.rs
index 2ec670fb6e..54477ca013 100644
--- a/common/client-libs/validator-client/src/nymd/mod.rs
+++ b/common/client-libs/validator-client/src/nymd/mod.rs
@@ -15,8 +15,7 @@ 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;
@@ -354,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,
@@ -698,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,
diff --git a/common/client-libs/validator-client/src/validator_api/mod.rs b/common/client-libs/validator-client/src/validator_api/mod.rs
index dcc448d7d9..8b993a5b7e 100644
--- a/common/client-libs/validator-client/src/validator_api/mod.rs
+++ b/common/client-libs/validator-client/src/validator_api/mod.rs
@@ -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,
diff --git a/common/crypto/src/hkdf.rs b/common/crypto/src/hkdf.rs
index 8791ea1bbf..5300947448 100644
--- a/common/crypto/src/hkdf.rs
+++ b/common/crypto/src/hkdf.rs
@@ -5,18 +5,13 @@ use digest::{BlockInput, FixedOutput, Reset, Update};
 use generic_array::ArrayLength;
 use hkdf::Hkdf;
 
-#[derive(Debug)]
-pub enum HkdfError {
-    InvalidOkmLength,
-}
-
 /// Perform HKDF `extract` then `expand` as a single step.
 pub fn extract_then_expand<D>(
     salt: Option<&[u8]>,
     ikm: &[u8],
     info: Option<&[u8]>,
     okm_length: usize,
-) -> Result<Vec<u8>, HkdfError>
+) -> Result<Vec<u8>, hkdf::InvalidLength>
 where
     D: Update + BlockInput + FixedOutput + Reset + Default + Clone,
     D::BlockSize: ArrayLength<u8>,
@@ -27,9 +22,7 @@ where
 
     let hkdf = Hkdf::<D>::new(salt, ikm);
     let mut okm = vec![0u8; okm_length];
-    if hkdf.expand(info.unwrap_or_else(|| &[]), &mut okm).is_err() {
-        return Err(HkdfError::InvalidOkmLength);
-    }
+    hkdf.expand(info.unwrap_or_else(|| &[]), &mut okm)?;
 
     Ok(okm)
 }
diff --git a/common/mixnet-contract/src/delegation.rs b/common/mixnet-contract/src/delegation.rs
index 65fc4c1dd2..87d6e63a51 100644
--- a/common/mixnet-contract/src/delegation.rs
+++ b/common/mixnet-contract/src/delegation.rs
@@ -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>>,
diff --git a/common/mixnet-contract/src/gateway.rs b/common/mixnet-contract/src/gateway.rs
index 6318452ecb..25c9fe0bab 100644
--- a/common/mixnet-contract/src/gateway.rs
+++ b/common/mixnet-contract/src/gateway.rs
@@ -2,15 +2,13 @@
 #![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;
-
 #[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema, TS)]
 pub struct Gateway {
     pub host: String,
@@ -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,
@@ -64,27 +59,11 @@ impl GatewayBond {
 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
@@ -93,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 {
@@ -175,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(),
@@ -196,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(),
@@ -212,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
diff --git a/common/mixnet-contract/src/lib.rs b/common/mixnet-contract/src/lib.rs
index 23295df1a2..ffecdea57c 100644
--- a/common/mixnet-contract/src/lib.rs
+++ b/common/mixnet-contract/src/lib.rs
@@ -9,18 +9,10 @@ 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)
-}
diff --git a/common/mixnet-contract/src/mixnode.rs b/common/mixnet-contract/src/mixnode.rs
index 53610ab36e..25cce43c11 100644
--- a/common/mixnet-contract/src/mixnode.rs
+++ b/common/mixnet-contract/src/mixnode.rs
@@ -10,8 +10,6 @@ use std::cmp::Ordering;
 use std::fmt::Display;
 use ts_rs::TS;
 
-use crate::current_block_height;
-
 #[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema, TS)]
 pub struct MixNode {
     pub host: String,
@@ -41,7 +39,6 @@ pub struct MixNodeBond {
     pub total_delegation: Coin,
     pub owner: Addr,
     pub layer: Layer,
-    #[serde(default = "current_block_height")]
     pub block_height: u64,
     pub mix_node: MixNode,
 }
diff --git a/common/mixnet-contract/src/msg.rs b/common/mixnet-contract/src/msg.rs
index 15b4193369..dfda40befa 100644
--- a/common/mixnet-contract/src/msg.rs
+++ b/common/mixnet-contract/src/msg.rs
@@ -31,25 +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,
     },
-
-    RewardGateway {
-        identity: IdentityKey,
-        // percentage value in range 0-100
-        uptime: u32,
-    },
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
@@ -88,24 +74,6 @@ 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 {},
 }
 
diff --git a/common/mixnet-contract/src/types.rs b/common/mixnet-contract/src/types.rs
index bc3e3eb24f..b2a16515fe 100644
--- a/common/mixnet-contract/src/types.rs
+++ b/common/mixnet-contract/src/types.rs
@@ -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
         )
     }
 }
diff --git a/common/nymsphinx/src/receiver.rs b/common/nymsphinx/src/receiver.rs
index 01f308ac75..c3e9aebd9d 100644
--- a/common/nymsphinx/src/receiver.rs
+++ b/common/nymsphinx/src/receiver.rs
@@ -156,11 +156,9 @@ impl MessageReceiver {
             };
 
             // Finally, remove the zero padding from the message
-            if Self::remove_padding(&mut message).is_err() {
-                return Err(MessageRecoveryError::MalformedReconstructedMessage(
-                    used_sets,
-                ));
-            };
+            Self::remove_padding(&mut message).map_err(|_| {
+                MessageRecoveryError::MalformedReconstructedMessage(used_sets.clone())
+            })?;
 
             Ok(Some((
                 ReconstructedMessage {
@@ -270,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(),
diff --git a/common/topology/src/gateway.rs b/common/topology/src/gateway.rs
index 45fb7b0dfd..f617089592 100644
--- a/common/topology/src/gateway.rs
+++ b/common/topology/src/gateway.rs
@@ -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,
diff --git a/contracts/mixnet/src/contract.rs b/contracts/mixnet/src/contract.rs
index 8321e1fc3a..4dc9dac8e4 100644
--- a/contracts/mixnet/src/contract.rs
+++ b/contracts/mixnet/src/contract.rs
@@ -22,18 +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 = 100;
-pub const INITIAL_GATEWAY_ACTIVE_SET_SIZE: u32 = 20;
 
 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,
@@ -43,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,
-        ),
     }
 }
 
@@ -110,21 +94,12 @@ pub fn execute(
         ExecuteMsg::RewardMixnode { identity, uptime } => {
             transactions::try_reward_mixnode(deps, env, info, identity, uptime)
         }
-        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)
-        }
     }
 }
 
@@ -176,37 +151,6 @@ 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,
-        )?),
     };
 
     Ok(query_res?)
diff --git a/contracts/mixnet/src/error.rs b/contracts/mixnet/src/error.rs
index 652533d6d0..3610edee30 100644
--- a/contracts/mixnet/src/error.rs
+++ b/contracts/mixnet/src/error.rs
@@ -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,10 +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,
-    },
 }
diff --git a/contracts/mixnet/src/helpers.rs b/contracts/mixnet/src/helpers.rs
index 0bb672dbad..de5636a0ac 100644
--- a/contracts/mixnet/src/helpers.rs
+++ b/contracts/mixnet/src/helpers.rs
@@ -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()),
-        );
-    }
 }
diff --git a/contracts/mixnet/src/queries.rs b/contracts/mixnet/src/queries.rs
index 0d2c3826aa..e76d62a93c 100644
--- a/contracts/mixnet/src/queries.rs
+++ b/contracts/mixnet/src/queries.rs
@@ -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, gateway_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,
+    all_mix_delegations_read, gateways_owners_read, gateways_read, mix_delegations_read,
+    mixnodes_owners_read, mixnodes_read, read_layer_distribution, read_state_params,
     reverse_mix_delegations_read,
 };
 use config::defaults::DENOM;
 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;
@@ -211,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,
@@ -673,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();
@@ -1203,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());
-        }
-    }
 }
diff --git a/contracts/mixnet/src/state.rs b/contracts/mixnet/src/state.rs
index c537366f07..6371e6529f 100644
--- a/contracts/mixnet/src/state.rs
+++ b/contracts/mixnet/src/state.rs
@@ -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
 }
diff --git a/contracts/mixnet/src/storage.rs b/contracts/mixnet/src/storage.rs
index 21cd2c41da..80aaddecf3 100644
--- a/contracts/mixnet/src/storage.rs
+++ b/contracts/mixnet/src/storage.rs
@@ -32,9 +32,7 @@ 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
 
@@ -63,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)
@@ -79,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)
 }
@@ -214,56 +196,6 @@ pub(crate) fn increase_mix_delegated_stakes(
     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(
@@ -338,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(
@@ -396,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::*;
@@ -499,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 {
@@ -551,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::*;
@@ -858,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()
-            );
-        }
-    }
 }
diff --git a/contracts/mixnet/src/transactions.rs b/contracts/mixnet/src/transactions.rs
index 7b2ec5c14c..8173243bbc 100644
--- a/contracts/mixnet/src/transactions.rs
+++ b/contracts/mixnet/src/transactions.rs
@@ -226,18 +226,13 @@ pub(crate) fn try_add_gateway(
     let minimum_bond = read_state_params(deps.storage).minimum_gateway_bond;
     validate_gateway_bond(&info.funds, minimum_bond)?;
 
-    let mut bond = GatewayBond::new(
+    let bond = GatewayBond::new(
         info.funds[0].clone(),
         info.sender.clone(),
         env.block.height,
         gateway,
     );
 
-    // this might potentially require more gas if a significant number of delegations was there
-    let delegations_bucket = gateway_delegations_read(deps.storage, &bond.gateway.identity_key);
-    let existing_delegation = total_delegations(delegations_bucket)?;
-    bond.total_delegation = existing_delegation;
-
     let identity = bond.identity();
     gateways(deps.storage).save(identity.as_bytes(), &bond)?;
     gateways_owners(deps.storage).save(sender_bytes, identity)?;
@@ -315,50 +310,28 @@ pub(crate) fn try_update_state_params(
         return Err(ContractError::DecreasingMixnodeBondReward);
     }
 
-    if params.gateway_bond_reward_rate < Decimal::one() {
-        return Err(ContractError::DecreasingGatewayBondReward);
-    }
-
     if params.mixnode_delegation_reward_rate < Decimal::one() {
         return Err(ContractError::DecreasingMixnodeDelegationReward);
     }
 
-    if params.gateway_delegation_reward_rate < Decimal::one() {
-        return Err(ContractError::DecreasingGatewayDelegationReward);
-    }
-
-    // if we're updating epoch length, recalculate rewards for both mixnodes and gateways
+    // if we're updating epoch length, recalculate rewards for mixnodes
     if state.params.epoch_length != params.epoch_length {
         state.mixnode_epoch_bond_reward =
             calculate_epoch_reward_rate(params.epoch_length, params.mixnode_bond_reward_rate);
-        state.gateway_epoch_bond_reward =
-            calculate_epoch_reward_rate(params.epoch_length, params.gateway_bond_reward_rate);
         state.mixnode_epoch_delegation_reward =
             calculate_epoch_reward_rate(params.epoch_length, params.mixnode_delegation_reward_rate);
-        state.gateway_epoch_delegation_reward =
-            calculate_epoch_reward_rate(params.epoch_length, params.gateway_delegation_reward_rate);
     } else {
-        // if mixnode or gateway rewards changed, recalculate respective values
+        // if mixnode rewards changed, recalculate respective values
         if state.params.mixnode_bond_reward_rate != params.mixnode_bond_reward_rate {
             state.mixnode_epoch_bond_reward =
                 calculate_epoch_reward_rate(params.epoch_length, params.mixnode_bond_reward_rate);
         }
-        if state.params.gateway_bond_reward_rate != params.gateway_bond_reward_rate {
-            state.gateway_epoch_bond_reward =
-                calculate_epoch_reward_rate(params.epoch_length, params.gateway_bond_reward_rate);
-        }
         if state.params.mixnode_delegation_reward_rate != params.mixnode_delegation_reward_rate {
             state.mixnode_epoch_delegation_reward = calculate_epoch_reward_rate(
                 params.epoch_length,
                 params.mixnode_delegation_reward_rate,
             );
         }
-        if state.params.gateway_delegation_reward_rate != params.gateway_delegation_reward_rate {
-            state.gateway_epoch_delegation_reward = calculate_epoch_reward_rate(
-                params.epoch_length,
-                params.gateway_delegation_reward_rate,
-            );
-        }
     }
 
     state.params = params;
@@ -443,81 +416,6 @@ pub(crate) fn try_reward_mixnode(
     })
 }
 
-// Note: if any changes are made to this function or anything it is calling down the stack,
-// for example delegation reward distribution, the gas limits must be retested and both
-// validator-api/src/rewarding/mod.rs::{GATEWAY_REWARD_OP_BASE_GAS_LIMIT, PER_GATEWAY_DELEGATION_GAS_INCREASE}
-// must be updated appropriately.
-pub(crate) fn try_reward_gateway(
-    deps: DepsMut,
-    env: Env,
-    info: MessageInfo,
-    gateway_identity: IdentityKey,
-    uptime: u32,
-) -> Result<Response, ContractError> {
-    let state = config_read(deps.storage).load().unwrap();
-
-    // check if this is executed by the owner, if not reject the transaction
-    if info.sender != state.network_monitor_address {
-        return Err(ContractError::Unauthorized);
-    }
-
-    // optimisation for uptime being 0. No rewards will be given so just terminate here
-    if uptime == 0 {
-        return Ok(Response {
-            submessages: vec![],
-            messages: vec![],
-            attributes: vec![
-                attr("bond increase", Uint128(0)),
-                attr("total delegation increase", Uint128(0)),
-            ],
-            data: None,
-        });
-    }
-
-    // check if the bond even exists
-    let mut current_bond = match gateways_read(deps.storage).load(gateway_identity.as_bytes()) {
-        Ok(bond) => bond,
-        Err(_) => {
-            return Ok(Response {
-                attributes: vec![attr("result", "bond not found")],
-                ..Default::default()
-            });
-        }
-    };
-
-    let bond_reward_rate = read_gateway_epoch_bond_reward_rate(deps.storage);
-    let delegation_reward_rate = read_gateway_epoch_delegation_reward_rate(deps.storage);
-    let scaled_bond_reward_rate = scale_reward_by_uptime(bond_reward_rate, uptime)?;
-    let scaled_delegation_reward_rate = scale_reward_by_uptime(delegation_reward_rate, uptime)?;
-
-    let mut node_reward = Uint128(0);
-    let total_delegation_reward = increase_gateway_delegated_stakes(
-        deps.storage,
-        &gateway_identity,
-        scaled_delegation_reward_rate,
-        env.block.height,
-    )?;
-
-    // update current bond with the reward given to the node and the delegators
-    // if it has been bonded for long enough
-    if current_bond.block_height + MINIMUM_BLOCK_AGE_FOR_REWARDING <= env.block.height {
-        node_reward = current_bond.bond_amount.amount * scaled_bond_reward_rate;
-        current_bond.bond_amount.amount += node_reward;
-        current_bond.total_delegation.amount += total_delegation_reward;
-        gateways(deps.storage).save(gateway_identity.as_bytes(), &current_bond)?;
-    }
-
-    Ok(Response {
-        submessages: vec![],
-        messages: vec![],
-        attributes: vec![
-            attr("bond increase", node_reward),
-            attr("total delegation increase", total_delegation_reward),
-        ],
-        data: None,
-    })
-}
-
 fn validate_delegation_stake(delegation: &[Coin]) -> Result<(), ContractError> {
     // check if anything was put as delegation
     if delegation.is_empty() {
@@ -630,119 +528,19 @@ pub(crate) fn try_remove_delegation_from_mixnode(
     }
 }
 
-pub(crate) fn try_delegate_to_gateway(
-    deps: DepsMut,
-    env: Env,
-    info: MessageInfo,
-    gateway_identity: IdentityKey,
-) -> Result<Response, ContractError> {
-    // check if the delegation contains any funds of the appropriate denomination
-    validate_delegation_stake(&info.funds)?;
-
-    // check if the target node actually exists
-    let mut gateways_bucket = gateways(deps.storage);
-    let mut current_bond = match gateways_bucket.load(gateway_identity.as_bytes()) {
-        Ok(bond) => bond,
-        Err(_) => {
-            return Err(ContractError::GatewayBondNotFound {
-                identity: gateway_identity,
-            });
-        }
-    };
-
-    // update total_delegation of this node
-    current_bond.total_delegation.amount += info.funds[0].amount;
-    gateways_bucket.save(gateway_identity.as_bytes(), &current_bond)?;
-
-    let mut delegation_bucket = gateway_delegations(deps.storage, &gateway_identity);
-    let sender_bytes = info.sender.as_bytes();
-
-    // write the delegation
-    let new_amount = match delegation_bucket.may_load(sender_bytes)? {
-        Some(existing_delegation) => existing_delegation.amount + info.funds[0].amount,
-        None => info.funds[0].amount,
-    };
-    // the block height is reset, if it existed
-    let new_delegation = RawDelegationData::new(new_amount, env.block.height);
-    delegation_bucket.save(sender_bytes, &new_delegation)?;
-
-    reverse_gateway_delegations(deps.storage, &info.sender)
-        .save(gateway_identity.as_bytes(), &())?;
-
-    Ok(Response::default())
-}
-
-pub(crate) fn try_remove_delegation_from_gateway(
-    deps: DepsMut,
-    info: MessageInfo,
-    gateway_identity: IdentityKey,
-) -> Result<Response, ContractError> {
-    let mut delegation_bucket = gateway_delegations(deps.storage, &gateway_identity);
-    let sender_bytes = info.sender.as_bytes();
-    match delegation_bucket.may_load(sender_bytes)? {
-        Some(delegation) => {
-            // remove delegation from the buckets
-            delegation_bucket.remove(sender_bytes);
-            reverse_gateway_delegations(deps.storage, &info.sender)
-                .remove(gateway_identity.as_bytes());
-
-            // send delegated funds back to the delegation owner
-            let messages = vec![BankMsg::Send {
-                to_address: info.sender.to_string(),
-                amount: coins(delegation.amount.u128(), DENOM),
-            }
-            .into()];
-
-            // update total_delegation of this node
-            let mut gateways_bucket = gateways(deps.storage);
-            // in some rare cases the gateway bond might no longer exist as the node unbonded
-            // before delegation was removed. that is fine
-            if let Some(mut existing_bond) =
-                gateways_bucket.may_load(gateway_identity.as_bytes())?
-            {
-                // we should NEVER underflow here, if we do, it means we have some serious error in our logic
-                existing_bond.total_delegation.amount = existing_bond
-                    .total_delegation
-                    .amount
-                    .checked_sub(delegation.amount)
-                    .unwrap();
-                gateways_bucket.save(gateway_identity.as_bytes(), &existing_bond)?;
-            }
-
-            Ok(Response {
-                submessages: Vec::new(),
-                messages,
-                attributes: Vec::new(),
-                data: None,
-            })
-        }
-        None => Err(ContractError::NoGatewayDelegationFound {
-            identity: gateway_identity,
-            address: info.sender,
-        }),
-    }
-}
-
 #[cfg(test)]
 pub mod tests {
     use super::*;
     use crate::contract::{
-        execute, query, INITIAL_DEFAULT_EPOCH_LENGTH, INITIAL_GATEWAY_BOND,
-        INITIAL_GATEWAY_BOND_REWARD_RATE, INITIAL_GATEWAY_DELEGATION_REWARD_RATE,
-        INITIAL_MIXNODE_BOND, INITIAL_MIXNODE_BOND_REWARD_RATE,
-        INITIAL_MIXNODE_DELEGATION_REWARD_RATE,
+        execute, query, INITIAL_DEFAULT_EPOCH_LENGTH, INITIAL_GATEWAY_BOND, INITIAL_MIXNODE_BOND,
+        INITIAL_MIXNODE_BOND_REWARD_RATE, INITIAL_MIXNODE_DELEGATION_REWARD_RATE,
     };
     use crate::helpers::calculate_epoch_reward_rate;
     use crate::queries::DELEGATION_PAGE_DEFAULT_LIMIT;
-    use crate::storage::{
-        gateway_delegations, gateway_delegations_read, layer_distribution_read,
-        mix_delegations_read, read_gateway_bond, read_gateway_epoch_bond_reward_rate,
-        read_mixnode_bond,
-    };
+    use crate::storage::{layer_distribution_read, mix_delegations_read, read_mixnode_bond};
     use crate::support::tests::helpers;
     use crate::support::tests::helpers::{
-        add_gateway, add_mixnode, gateway_fixture, good_gateway_bond, good_mixnode_bond,
-        mix_node_fixture, raw_delegation_fixture,
+        add_mixnode, good_gateway_bond, good_mixnode_bond, mix_node_fixture, raw_delegation_fixture,
     };
     use cosmwasm_std::testing::{mock_env, mock_info};
     use cosmwasm_std::{coin, coins, from_binary, Addr, Uint128};
@@ -750,7 +548,7 @@ pub mod tests {
         ExecuteMsg, LayerDistribution, PagedGatewayResponse, PagedMixnodeResponse, QueryMsg,
         UnpackedDelegation,
     };
-    use queries::tests::{store_n_gateway_delegations, store_n_mix_delegations};
+    use queries::tests::store_n_mix_delegations;
 
     #[test]
     fn validating_mixnode_bond() {
@@ -1596,15 +1394,10 @@ pub mod tests {
             minimum_mixnode_bond: INITIAL_MIXNODE_BOND,
             minimum_gateway_bond: INITIAL_GATEWAY_BOND,
             mixnode_bond_reward_rate: Decimal::percent(INITIAL_MIXNODE_BOND_REWARD_RATE),
-            gateway_bond_reward_rate: Decimal::percent(INITIAL_GATEWAY_BOND_REWARD_RATE),
             mixnode_delegation_reward_rate: Decimal::percent(
                 INITIAL_MIXNODE_DELEGATION_REWARD_RATE,
             ),
-            gateway_delegation_reward_rate: Decimal::percent(
-                INITIAL_GATEWAY_DELEGATION_REWARD_RATE,
-            ),
             mixnode_active_set_size: 42, // change something
-            gateway_active_set_size: 5,
         };
 
         // cannot be updated from non-owner account
@@ -1656,93 +1449,7 @@ pub mod tests {
             new_state.mixnode_epoch_delegation_reward
         );
 
-        // gateway_epoch_rewards are recalculated if annual reward rate is changed
-        let current_gateway_bond_reward_rate =
-            read_gateway_epoch_bond_reward_rate(deps.as_ref().storage);
-        let current_gateway_delegation_reward_rate =
-            read_gateway_epoch_delegation_reward_rate(deps.as_ref().storage);
-        let new_gateway_bond_reward_rate = Decimal::percent(120);
-        let new_gateway_delegation_reward_rate = Decimal::percent(120);
-
-        // sanity check to make sure we are actually updating the values (in case we changed defaults at some point)
-        assert_ne!(
-            new_gateway_bond_reward_rate,
-            current_gateway_bond_reward_rate
-        );
-        assert_ne!(
-            new_gateway_delegation_reward_rate,
-            current_gateway_delegation_reward_rate
-        );
-
-        let mut new_params = current_state.params.clone();
-        new_params.gateway_bond_reward_rate = new_gateway_bond_reward_rate;
-        new_params.gateway_delegation_reward_rate = new_gateway_delegation_reward_rate;
-
-        let info = mock_info("creator", &[]);
-        try_update_state_params(deps.as_mut(), info, new_params.clone()).unwrap();
-
-        let new_state = config_read(deps.as_ref().storage).load().unwrap();
-        let expected_bond =
-            calculate_epoch_reward_rate(new_params.epoch_length, new_gateway_bond_reward_rate);
-        let expected_delegation = calculate_epoch_reward_rate(
-            new_params.epoch_length,
-            new_gateway_delegation_reward_rate,
-        );
-        assert_eq!(expected_bond, new_state.gateway_epoch_bond_reward);
-        assert_eq!(
-            expected_delegation,
-            new_state.gateway_epoch_delegation_reward
-        );
-
-        // if annual reward rate is changed for both mixnodes and gateways in a single update operation,
-        // both mixnode_epoch_rewards and gateway_epoch_rewards are recalculated
-        let current_state = config_read(deps.as_ref().storage).load().unwrap();
-        let new_mixnode_bond_reward_rate = Decimal::percent(130);
-        let new_gateway_bond_reward_rate = Decimal::percent(130);
-        assert_ne!(
-            new_mixnode_bond_reward_rate,
-            current_state.params.mixnode_bond_reward_rate
-        );
-        assert_ne!(
-            new_gateway_bond_reward_rate,
-            current_state.params.gateway_bond_reward_rate
-        );
-
-        let mut new_params = current_state.params.clone();
-        new_params.mixnode_bond_reward_rate = new_mixnode_bond_reward_rate;
-        new_params.mixnode_delegation_reward_rate = new_mixnode_delegation_reward_rate;
-        new_params.gateway_bond_reward_rate = new_gateway_bond_reward_rate;
-        new_params.gateway_delegation_reward_rate = new_gateway_delegation_reward_rate;
-
-        let info = mock_info("creator", &[]);
-        try_update_state_params(deps.as_mut(), info, new_params.clone()).unwrap();
-
-        let new_state = config_read(deps.as_ref().storage).load().unwrap();
-        let expected_mixnode_bond =
-            calculate_epoch_reward_rate(new_params.epoch_length, new_mixnode_bond_reward_rate);
-        let expected_mixnode_delegation = calculate_epoch_reward_rate(
-            new_params.epoch_length,
-            new_mixnode_delegation_reward_rate,
-        );
-        assert_eq!(expected_mixnode_bond, new_state.mixnode_epoch_bond_reward);
-        assert_eq!(
-            expected_mixnode_delegation,
-            new_state.mixnode_epoch_delegation_reward
-        );
-
-        let expected_gateway_bond =
-            calculate_epoch_reward_rate(new_params.epoch_length, new_gateway_bond_reward_rate);
-        let expected_gateway_delegation = calculate_epoch_reward_rate(
-            new_params.epoch_length,
-            new_gateway_delegation_reward_rate,
-        );
-        assert_eq!(expected_gateway_bond, new_state.gateway_epoch_bond_reward);
-        assert_eq!(
-            expected_gateway_delegation,
-            new_state.gateway_epoch_delegation_reward
-        );
-
-        // both mixnode_epoch_rewards and gateway_epoch_rewards are updated on epoch length change
+        // mixnode_epoch_rewards is updated on epoch length change
         let new_epoch_length = 42;
         // sanity check to make sure we are actually updating the value (in case we changed defaults at some point)
         assert_ne!(new_epoch_length, current_state.params.epoch_length);
@@ -1764,18 +1471,6 @@ pub mod tests {
             expected_mixnode_delegation,
             new_state.mixnode_epoch_delegation_reward
         );
-
-        let expected_gateway_bond =
-            calculate_epoch_reward_rate(new_epoch_length, new_params.gateway_bond_reward_rate);
-        let expected_gateway_delegation = calculate_epoch_reward_rate(
-            new_epoch_length,
-            new_params.gateway_delegation_reward_rate,
-        );
-        assert_eq!(expected_gateway_bond, new_state.gateway_epoch_bond_reward);
-        assert_eq!(
-            expected_gateway_delegation,
-            new_state.gateway_epoch_delegation_reward
-        );
     }
 
     #[test]
@@ -2016,241 +1711,6 @@ pub mod tests {
         );
     }
 
-    #[test]
-    fn rewarding_gateway() {
-        let mut deps = helpers::init_contract();
-        let mut env = mock_env();
-        let current_state = config(deps.as_mut().storage).load().unwrap();
-        let network_monitor_address = current_state.network_monitor_address;
-
-        let node_owner: Addr = Addr::unchecked("node-owner");
-        let node_identity: IdentityKey = "nodeidentity".into();
-
-        // errors out if executed by somebody else than network monitor
-        let info = mock_info("not-the-monitor", &[]);
-        let res = try_reward_gateway(deps.as_mut(), env.clone(), info, node_identity.clone(), 100);
-        assert_eq!(res, Err(ContractError::Unauthorized));
-
-        // returns bond not found attribute if the target owner hasn't bonded any gateways
-        let info = mock_info(network_monitor_address.as_ref(), &[]);
-        let res = try_reward_gateway(deps.as_mut(), env.clone(), info, node_identity.clone(), 100)
-            .unwrap();
-        assert_eq!(vec![attr("result", "bond not found")], res.attributes);
-
-        let initial_bond = 100_000000;
-        let initial_delegation = 200_000000;
-        let gateway_bond = GatewayBond {
-            bond_amount: coin(initial_bond, DENOM),
-            total_delegation: coin(initial_delegation, DENOM),
-            owner: node_owner.clone(),
-            block_height: env.block.height,
-            gateway: Gateway {
-                identity_key: node_identity.clone(),
-                ..gateway_fixture()
-            },
-        };
-
-        gateways(deps.as_mut().storage)
-            .save(node_identity.as_bytes(), &gateway_bond)
-            .unwrap();
-
-        gateway_delegations(&mut deps.storage, &node_identity)
-            .save(b"delegator", &raw_delegation_fixture(initial_delegation))
-            .unwrap();
-
-        env.block.height += 2 * MINIMUM_BLOCK_AGE_FOR_REWARDING;
-
-        let bond_reward_rate = read_gateway_epoch_bond_reward_rate(deps.as_ref().storage);
-        let delegation_reward_rate =
-            read_gateway_epoch_delegation_reward_rate(deps.as_ref().storage);
-        let expected_bond_reward = Uint128(initial_bond) * bond_reward_rate;
-        let expected_delegation_reward = Uint128(initial_delegation) * delegation_reward_rate;
-
-        // the node's bond and delegations are correctly increased and scaled by uptime
-        // if node was 100% up, it will get full epoch reward
-        let expected_bond = expected_bond_reward + Uint128(initial_bond);
-        let expected_delegation = expected_delegation_reward + Uint128(initial_delegation);
-
-        let info = mock_info(network_monitor_address.as_ref(), &[]);
-        let res = try_reward_gateway(deps.as_mut(), env.clone(), info, node_identity.clone(), 100)
-            .unwrap();
-
-        assert_eq!(
-            expected_bond,
-            read_gateway_bond(deps.as_ref().storage, node_identity.as_bytes()).unwrap()
-        );
-
-        assert_eq!(
-            expected_delegation,
-            read_gateway_delegation(deps.as_ref().storage, node_identity.as_bytes()).unwrap()
-        );
-
-        assert_eq!(
-            vec![
-                attr("bond increase", expected_bond_reward),
-                attr("total delegation increase", expected_delegation_reward),
-            ],
-            res.attributes
-        );
-
-        // if node was 20% up, it will get 1/5th of epoch reward
-        let scaled_bond_reward = scale_reward_by_uptime(bond_reward_rate, 20).unwrap();
-        let scaled_delegation_reward = scale_reward_by_uptime(delegation_reward_rate, 20).unwrap();
-        let expected_bond_reward = expected_bond * scaled_bond_reward;
-        let expected_delegation_reward = expected_delegation * scaled_delegation_reward;
-        let expected_bond = expected_bond_reward + expected_bond;
-        let expected_delegation = expected_delegation_reward + expected_delegation;
-
-        let info = mock_info(network_monitor_address.as_ref(), &[]);
-        let res = try_reward_gateway(deps.as_mut(), env.clone(), info, node_identity.clone(), 20)
-            .unwrap();
-
-        assert_eq!(
-            expected_bond,
-            read_gateway_bond(deps.as_ref().storage, node_identity.as_bytes()).unwrap()
-        );
-
-        assert_eq!(
-            expected_delegation,
-            read_gateway_delegation(deps.as_ref().storage, node_identity.as_bytes()).unwrap()
-        );
-
-        assert_eq!(
-            vec![
-                attr("bond increase", expected_bond_reward),
-                attr("total delegation increase", expected_delegation_reward),
-            ],
-            res.attributes
-        );
-    }
-
-    #[test]
-    fn rewarding_gateway_blockstamp_based() {
-        let mut deps = helpers::init_contract();
-        let mut env = mock_env();
-        let current_state = config(deps.as_mut().storage).load().unwrap();
-        let network_monitor_address = current_state.network_monitor_address;
-
-        let node_owner: Addr = Addr::unchecked("node-owner");
-        let node_identity: IdentityKey = "nodeidentity".into();
-
-        let initial_bond = 100_000000;
-        let initial_delegation = 200_000000;
-        let gateway_bond = GatewayBond {
-            bond_amount: coin(initial_bond, DENOM),
-            total_delegation: coin(initial_delegation, DENOM),
-            owner: node_owner.clone(),
-            block_height: env.block.height,
-            gateway: Gateway {
-                identity_key: node_identity.clone(),
-                ..gateway_fixture()
-            },
-        };
-
-        gateways(deps.as_mut().storage)
-            .save(node_identity.as_bytes(), &gateway_bond)
-            .unwrap();
-
-        // delegation happens later, but not later enough
-        env.block.height += MINIMUM_BLOCK_AGE_FOR_REWARDING - 1;
-
-        gateway_delegations(&mut deps.storage, &node_identity)
-            .save(
-                b"delegator",
-                &RawDelegationData::new(initial_delegation.into(), env.block.height),
-            )
-            .unwrap();
-
-        let bond_reward_rate = read_gateway_epoch_bond_reward_rate(deps.as_ref().storage);
-        let delegation_reward_rate =
-            read_gateway_epoch_delegation_reward_rate(deps.as_ref().storage);
-        let scaled_bond_reward = scale_reward_by_uptime(bond_reward_rate, 100).unwrap();
-        let scaled_delegation_reward = scale_reward_by_uptime(delegation_reward_rate, 100).unwrap();
-
-        // no reward is due
-        let expected_bond_reward = Uint128(0);
-        let expected_delegation_reward = Uint128(0);
-        let expected_bond = expected_bond_reward + Uint128(initial_bond);
-        let expected_delegation = expected_delegation_reward + Uint128(initial_delegation);
-
-        let info = mock_info(network_monitor_address.as_ref(), &[]);
-        let res = try_reward_gateway(deps.as_mut(), env.clone(), info, node_identity.clone(), 100)
-            .unwrap();
-
-        assert_eq!(
-            expected_bond,
-            read_gateway_bond(deps.as_ref().storage, node_identity.as_bytes()).unwrap()
-        );
-        assert_eq!(
-            expected_delegation,
-            read_gateway_delegation(deps.as_ref().storage, node_identity.as_bytes()).unwrap()
-        );
-
-        assert_eq!(
-            vec![
-                attr("bond increase", expected_bond_reward),
-                attr("total delegation increase", expected_delegation_reward),
-            ],
-            res.attributes
-        );
-
-        // reward can happen now, but only for bonded node
-        env.block.height += 1;
-        let expected_bond_reward = expected_bond * scaled_bond_reward;
-        let expected_delegation_reward = Uint128(0);
-        let expected_bond = expected_bond_reward + expected_bond;
-        let expected_delegation = expected_delegation_reward + expected_delegation;
-
-        let info = mock_info(network_monitor_address.as_ref(), &[]);
-        let res = try_reward_gateway(deps.as_mut(), env.clone(), info, node_identity.clone(), 100)
-            .unwrap();
-
-        assert_eq!(
-            expected_bond,
-            read_gateway_bond(deps.as_ref().storage, node_identity.as_bytes()).unwrap()
-        );
-        assert_eq!(
-            expected_delegation,
-            read_gateway_delegation(deps.as_ref().storage, node_identity.as_bytes()).unwrap()
-        );
-
-        assert_eq!(
-            vec![
-                attr("bond increase", expected_bond_reward),
-                attr("total delegation increase", expected_delegation_reward),
-            ],
-            res.attributes
-        );
-
-        // reward happens now, both for node owner and delegators
-        env.block.height += MINIMUM_BLOCK_AGE_FOR_REWARDING - 1;
-        let expected_bond_reward = expected_bond * scaled_bond_reward;
-        let expected_delegation_reward = expected_delegation * scaled_delegation_reward;
-        let expected_bond = expected_bond_reward + expected_bond;
-        let expected_delegation = expected_delegation_reward + expected_delegation;
-
-        let info = mock_info(network_monitor_address.as_ref(), &[]);
-        let res = try_reward_gateway(deps.as_mut(), env.clone(), info, node_identity.clone(), 100)
-            .unwrap();
-
-        assert_eq!(
-            expected_bond,
-            read_gateway_bond(deps.as_ref().storage, node_identity.as_bytes()).unwrap()
-        );
-        assert_eq!(
-            expected_delegation,
-            read_gateway_delegation(deps.as_ref().storage, node_identity.as_bytes()).unwrap()
-        );
-
-        assert_eq!(
-            vec![
-                attr("bond increase", expected_bond_reward),
-                attr("total delegation increase", expected_delegation_reward),
-            ],
-            res.attributes
-        );
-    }
-
     #[cfg(test)]
     mod delegation_stake_validation {
         use super::*;
@@ -3100,800 +2560,6 @@ pub mod tests {
         );
     }
 
-    #[cfg(test)]
-    mod gateway_stake_delegation {
-        use super::*;
-        use crate::storage::gateway_delegations_read;
-        use crate::support::tests::helpers::add_gateway;
-
-        #[test]
-        fn fails_if_node_doesnt_exist() {
-            let mut deps = helpers::init_contract();
-            assert_eq!(
-                Err(ContractError::GatewayBondNotFound {
-                    identity: "non-existent-gateway-identity".into()
-                }),
-                try_delegate_to_gateway(
-                    deps.as_mut(),
-                    mock_env(),
-                    mock_info("sender", &coins(123, DENOM)),
-                    "non-existent-gateway-identity".into()
-                )
-            );
-        }
-
-        #[test]
-        fn succeeds_for_existing_node() {
-            let mut deps = helpers::init_contract();
-            let gateway_owner = "bob";
-            let identity = add_gateway(gateway_owner, good_gateway_bond(), &mut deps);
-            let delegation_owner = Addr::unchecked("sender");
-
-            let delegation = coin(123, DENOM);
-            assert!(try_delegate_to_gateway(
-                deps.as_mut(),
-                mock_env(),
-                mock_info(delegation_owner.as_str(), &vec![delegation.clone()]),
-                identity.clone()
-            )
-            .is_ok());
-
-            assert_eq!(
-                RawDelegationData::new(delegation.amount, mock_env().block.height),
-                gateway_delegations_read(&deps.storage, &identity)
-                    .load(delegation_owner.as_bytes())
-                    .unwrap()
-            );
-            assert!(
-                reverse_gateway_delegations_read(&deps.storage, &delegation_owner)
-                    .load(identity.as_bytes())
-                    .is_ok()
-            );
-
-            // node's "total_delegation" is increased
-            assert_eq!(
-                delegation,
-                gateways_read(&deps.storage)
-                    .load(identity.as_bytes())
-                    .unwrap()
-                    .total_delegation
-            )
-        }
-
-        #[test]
-        fn fails_if_node_unbonded() {
-            let mut deps = helpers::init_contract();
-
-            let gateway_owner = "bob";
-            let identity = add_gateway(gateway_owner, good_gateway_bond(), &mut deps);
-            let delegation_owner = Addr::unchecked("sender");
-
-            try_remove_gateway(deps.as_mut(), mock_info(gateway_owner, &[])).unwrap();
-
-            assert_eq!(
-                Err(ContractError::GatewayBondNotFound {
-                    identity: identity.clone()
-                }),
-                try_delegate_to_gateway(
-                    deps.as_mut(),
-                    mock_env(),
-                    mock_info(delegation_owner.as_str(), &coins(123, DENOM)),
-                    identity
-                )
-            );
-        }
-
-        #[test]
-        fn succeeds_if_node_rebonded() {
-            let mut deps = helpers::init_contract();
-
-            let gateway_owner = "bob";
-            add_gateway(gateway_owner, good_gateway_bond(), &mut deps);
-            try_remove_gateway(deps.as_mut(), mock_info(gateway_owner, &[])).unwrap();
-            let identity = add_gateway(gateway_owner, good_gateway_bond(), &mut deps);
-            let delegation = coin(123, DENOM);
-            let delegation_owner = Addr::unchecked("sender");
-
-            assert!(try_delegate_to_gateway(
-                deps.as_mut(),
-                mock_env(),
-                mock_info(delegation_owner.as_str(), &vec![delegation.clone()]),
-                identity.clone()
-            )
-            .is_ok());
-
-            assert_eq!(
-                RawDelegationData::new(delegation.amount, mock_env().block.height),
-                gateway_delegations_read(&deps.storage, &identity)
-                    .load(delegation_owner.as_bytes())
-                    .unwrap()
-            );
-            assert!(
-                reverse_gateway_delegations_read(&deps.storage, &delegation_owner)
-                    .load(identity.as_bytes())
-                    .is_ok()
-            );
-
-            // node's "total_delegation" is increased
-            assert_eq!(
-                delegation,
-                gateways_read(&deps.storage)
-                    .load(identity.as_bytes())
-                    .unwrap()
-                    .total_delegation
-            )
-        }
-
-        #[test]
-        fn is_possible_for_an_already_delegated_node() {
-            let mut deps = helpers::init_contract();
-            let gateway_owner = "bob";
-            let identity = add_gateway(gateway_owner, good_gateway_bond(), &mut deps);
-            let delegation_owner = Addr::unchecked("sender");
-
-            let delegation1 = coin(100, DENOM);
-            let delegation2 = coin(50, DENOM);
-
-            try_delegate_to_gateway(
-                deps.as_mut(),
-                mock_env(),
-                mock_info(delegation_owner.as_str(), &vec![delegation1.clone()]),
-                identity.clone(),
-            )
-            .unwrap();
-
-            try_delegate_to_gateway(
-                deps.as_mut(),
-                mock_env(),
-                mock_info(delegation_owner.as_str(), &vec![delegation2.clone()]),
-                identity.clone(),
-            )
-            .unwrap();
-
-            assert_eq!(
-                RawDelegationData::new(
-                    delegation1.amount + delegation2.amount,
-                    mock_env().block.height
-                ),
-                gateway_delegations_read(&deps.storage, &identity)
-                    .load(delegation_owner.as_bytes())
-                    .unwrap()
-            );
-            assert!(
-                reverse_gateway_delegations_read(&deps.storage, &delegation_owner)
-                    .load(identity.as_bytes())
-                    .is_ok()
-            );
-
-            // node's "total_delegation" is sum of both
-            assert_eq!(
-                delegation1.amount + delegation2.amount,
-                gateways_read(&deps.storage)
-                    .load(identity.as_bytes())
-                    .unwrap()
-                    .total_delegation
-                    .amount
-            )
-        }
-
-        #[test]
-        fn block_height_is_updated_on_new_delegation() {
-            let mut deps = helpers::init_contract();
-            let gateway_owner = "bob";
-            let identity = add_gateway(gateway_owner, good_gateway_bond(), &mut deps);
-            let delegation_owner = Addr::unchecked("sender");
-            let delegation = coin(100, DENOM);
-
-            let env1 = mock_env();
-            let mut env2 = mock_env();
-            let initial_height = env1.block.height;
-            let updated_height = initial_height + 42;
-            // second env has grown in block height
-            env2.block.height = updated_height;
-
-            try_delegate_to_gateway(
-                deps.as_mut(),
-                env1,
-                mock_info(delegation_owner.as_str(), &vec![delegation.clone()]),
-                identity.clone(),
-            )
-            .unwrap();
-
-            assert_eq!(
-                RawDelegationData::new(delegation.amount, initial_height),
-                gateway_delegations_read(&deps.storage, &identity)
-                    .load(delegation_owner.as_bytes())
-                    .unwrap()
-            );
-
-            try_delegate_to_gateway(
-                deps.as_mut(),
-                env2,
-                mock_info(delegation_owner.as_str(), &vec![delegation.clone()]),
-                identity.clone(),
-            )
-            .unwrap();
-
-            assert_eq!(
-                RawDelegationData::new(delegation.amount + delegation.amount, updated_height),
-                gateway_delegations_read(&deps.storage, &identity)
-                    .load(delegation_owner.as_bytes())
-                    .unwrap()
-            );
-        }
-
-        #[test]
-        fn block_height_is_not_updated_on_different_delegator() {
-            let mut deps = helpers::init_contract();
-            let gateway_owner = "bob";
-            let identity = add_gateway(gateway_owner, good_gateway_bond(), &mut deps);
-            let delegation_owner1 = Addr::unchecked("sender1");
-            let delegation_owner2 = Addr::unchecked("sender2");
-            let delegation1 = coin(100, DENOM);
-            let delegation2 = coin(120, DENOM);
-
-            let env1 = mock_env();
-            let mut env2 = mock_env();
-            let initial_height = env1.block.height;
-            let second_height = initial_height + 42;
-            // second env has grown in block height
-            env2.block.height = second_height;
-
-            try_delegate_to_gateway(
-                deps.as_mut(),
-                env1,
-                mock_info(delegation_owner1.as_str(), &vec![delegation1.clone()]),
-                identity.clone(),
-            )
-            .unwrap();
-
-            assert_eq!(
-                RawDelegationData::new(delegation1.amount, initial_height),
-                gateway_delegations_read(&deps.storage, &identity)
-                    .load(delegation_owner1.as_bytes())
-                    .unwrap()
-            );
-
-            try_delegate_to_gateway(
-                deps.as_mut(),
-                env2,
-                mock_info(delegation_owner2.as_str(), &vec![delegation2.clone()]),
-                identity.clone(),
-            )
-            .unwrap();
-
-            assert_eq!(
-                RawDelegationData::new(delegation1.amount, initial_height),
-                gateway_delegations_read(&deps.storage, &identity)
-                    .load(delegation_owner1.as_bytes())
-                    .unwrap()
-            );
-            assert_eq!(
-                RawDelegationData::new(delegation2.amount, second_height),
-                gateway_delegations_read(&deps.storage, &identity)
-                    .load(delegation_owner2.as_bytes())
-                    .unwrap()
-            );
-        }
-
-        #[test]
-        fn is_disallowed_for_already_delegated_node_if_it_unbonded() {
-            let mut deps = helpers::init_contract();
-
-            let gateway_owner = "bob";
-            let identity = add_gateway(gateway_owner, good_gateway_bond(), &mut deps);
-            let delegation_owner = Addr::unchecked("sender");
-
-            try_delegate_to_gateway(
-                deps.as_mut(),
-                mock_env(),
-                mock_info(delegation_owner.as_str(), &coins(100, DENOM)),
-                identity.clone(),
-            )
-            .unwrap();
-
-            try_remove_gateway(deps.as_mut(), mock_info(gateway_owner, &[])).unwrap();
-
-            assert_eq!(
-                Err(ContractError::GatewayBondNotFound {
-                    identity: identity.clone()
-                }),
-                try_delegate_to_gateway(
-                    deps.as_mut(),
-                    mock_env(),
-                    mock_info(delegation_owner.as_str(), &coins(50, DENOM)),
-                    identity.clone()
-                )
-            );
-        }
-
-        #[test]
-        fn is_allowed_for_multiple_nodes() {
-            let mut deps = helpers::init_contract();
-            let gateway_owner1 = "bob";
-            let gateway_owner2 = "fred";
-            let identity1 = add_gateway(gateway_owner1, good_gateway_bond(), &mut deps);
-            let identity2 = add_gateway(gateway_owner2, good_gateway_bond(), &mut deps);
-            let delegation_owner = Addr::unchecked("sender");
-
-            assert!(try_delegate_to_gateway(
-                deps.as_mut(),
-                mock_env(),
-                mock_info(delegation_owner.as_str(), &coins(123, DENOM)),
-                identity1.clone()
-            )
-            .is_ok());
-
-            assert!(try_delegate_to_gateway(
-                deps.as_mut(),
-                mock_env(),
-                mock_info(delegation_owner.as_str(), &coins(42, DENOM)),
-                identity2.clone()
-            )
-            .is_ok());
-
-            assert_eq!(
-                RawDelegationData::new(123u128.into(), mock_env().block.height),
-                gateway_delegations_read(&deps.storage, &identity1)
-                    .load(delegation_owner.as_bytes())
-                    .unwrap()
-            );
-            assert!(
-                reverse_gateway_delegations_read(&deps.storage, &delegation_owner)
-                    .load(identity1.as_bytes())
-                    .is_ok()
-            );
-
-            assert_eq!(
-                RawDelegationData::new(42u128.into(), mock_env().block.height),
-                gateway_delegations_read(&deps.storage, &identity2)
-                    .load(delegation_owner.as_bytes())
-                    .unwrap()
-            );
-            assert!(
-                reverse_gateway_delegations_read(&deps.storage, &delegation_owner)
-                    .load(identity2.as_bytes())
-                    .is_ok()
-            );
-        }
-
-        #[test]
-        fn is_allowed_by_multiple_users() {
-            let mut deps = helpers::init_contract();
-            let gateway_owner = "bob";
-            let identity = add_gateway(gateway_owner, good_gateway_bond(), &mut deps);
-
-            let delegation1 = coin(123, DENOM);
-            let delegation2 = coin(234, DENOM);
-
-            assert!(try_delegate_to_gateway(
-                deps.as_mut(),
-                mock_env(),
-                mock_info("sender1", &vec![delegation1.clone()]),
-                identity.clone()
-            )
-            .is_ok());
-
-            assert!(try_delegate_to_gateway(
-                deps.as_mut(),
-                mock_env(),
-                mock_info("sender2", &vec![delegation2.clone()]),
-                identity.clone()
-            )
-            .is_ok());
-
-            // node's "total_delegation" is sum of both
-            assert_eq!(
-                delegation1.amount + delegation2.amount,
-                gateways_read(&deps.storage)
-                    .load(identity.as_bytes())
-                    .unwrap()
-                    .total_delegation
-                    .amount
-            )
-        }
-
-        #[test]
-        fn delegation_is_not_removed_if_node_unbonded() {
-            let mut deps = helpers::init_contract();
-
-            let gateway_owner = "bob";
-            let identity = add_gateway(gateway_owner, good_gateway_bond(), &mut deps);
-            let delegation_owner = Addr::unchecked("sender");
-
-            try_delegate_to_gateway(
-                deps.as_mut(),
-                mock_env(),
-                mock_info(delegation_owner.as_str(), &coins(100, DENOM)),
-                identity.clone(),
-            )
-            .unwrap();
-
-            try_remove_gateway(deps.as_mut(), mock_info(gateway_owner, &[])).unwrap();
-
-            assert_eq!(
-                RawDelegationData::new(100u128.into(), mock_env().block.height),
-                gateway_delegations_read(&deps.storage, &identity)
-                    .load(delegation_owner.as_bytes())
-                    .unwrap()
-            );
-            assert!(
-                reverse_gateway_delegations_read(&deps.storage, &delegation_owner)
-                    .load(identity.as_bytes())
-                    .is_ok()
-            );
-        }
-    }
-
-    #[cfg(test)]
-    mod removing_gateway_stake_delegation {
-        use super::*;
-        use crate::storage::gateway_delegations_read;
-        use crate::support::tests::helpers::add_gateway;
-
-        #[test]
-        fn fails_if_delegation_never_existed() {
-            let mut deps = helpers::init_contract();
-
-            let gateway_owner = "bob";
-            let identity = add_gateway(gateway_owner, good_gateway_bond(), &mut deps);
-            let delegation_owner = Addr::unchecked("sender");
-
-            assert_eq!(
-                Err(ContractError::NoGatewayDelegationFound {
-                    identity: identity.clone(),
-                    address: delegation_owner.clone(),
-                }),
-                try_remove_delegation_from_gateway(
-                    deps.as_mut(),
-                    mock_info(delegation_owner.as_str(), &[]),
-                    identity,
-                )
-            );
-        }
-
-        #[test]
-        fn succeeds_if_delegation_existed() {
-            let mut deps = helpers::init_contract();
-
-            let gateway_owner = "bob";
-            let identity = add_gateway(gateway_owner, good_gateway_bond(), &mut deps);
-            let delegation_owner = Addr::unchecked("sender");
-
-            try_delegate_to_gateway(
-                deps.as_mut(),
-                mock_env(),
-                mock_info(delegation_owner.as_str(), &coins(100, DENOM)),
-                identity.clone(),
-            )
-            .unwrap();
-
-            assert_eq!(
-                Ok(Response {
-                    submessages: vec![],
-                    messages: vec![BankMsg::Send {
-                        to_address: delegation_owner.clone().into(),
-                        amount: coins(100, DENOM),
-                    }
-                    .into()],
-                    attributes: Vec::new(),
-                    data: None,
-                }),
-                try_remove_delegation_from_gateway(
-                    deps.as_mut(),
-                    mock_info(delegation_owner.as_str(), &[]),
-                    identity.clone(),
-                )
-            );
-
-            assert!(gateway_delegations_read(&deps.storage, &identity)
-                .may_load(delegation_owner.as_bytes())
-                .unwrap()
-                .is_none());
-            assert!(
-                reverse_mix_delegations_read(&deps.storage, &delegation_owner)
-                    .may_load(identity.as_bytes())
-                    .unwrap()
-                    .is_none()
-            );
-
-            // and total delegation is cleared
-            assert_eq!(
-                Uint128::zero(),
-                gateways_read(&deps.storage)
-                    .load(identity.as_bytes())
-                    .unwrap()
-                    .total_delegation
-                    .amount
-            )
-        }
-
-        #[test]
-        fn succeeds_if_delegation_existed_even_if_node_unbonded() {
-            let mut deps = helpers::init_contract();
-
-            let gateway_owner = "bob";
-            let identity = add_gateway(gateway_owner, good_gateway_bond(), &mut deps);
-            let delegation_owner = Addr::unchecked("sender");
-
-            try_delegate_to_gateway(
-                deps.as_mut(),
-                mock_env(),
-                mock_info(delegation_owner.as_str(), &coins(100, DENOM)),
-                identity.clone(),
-            )
-            .unwrap();
-
-            try_remove_gateway(deps.as_mut(), mock_info(gateway_owner, &[])).unwrap();
-
-            assert_eq!(
-                Ok(Response {
-                    submessages: vec![],
-                    messages: vec![BankMsg::Send {
-                        to_address: delegation_owner.clone().into(),
-                        amount: coins(100, DENOM),
-                    }
-                    .into()],
-                    attributes: Vec::new(),
-                    data: None,
-                }),
-                try_remove_delegation_from_gateway(
-                    deps.as_mut(),
-                    mock_info(delegation_owner.as_str(), &[]),
-                    identity.clone(),
-                )
-            );
-
-            assert!(gateway_delegations_read(&deps.storage, &identity)
-                .may_load(delegation_owner.as_bytes())
-                .unwrap()
-                .is_none());
-            assert!(
-                reverse_gateway_delegations_read(&deps.storage, &delegation_owner)
-                    .may_load(identity.as_bytes())
-                    .unwrap()
-                    .is_none()
-            );
-        }
-
-        #[test]
-        fn total_delegation_is_preserved_if_only_some_undelegate() {
-            let mut deps = helpers::init_contract();
-            let gateway_owner = "bob";
-            let identity = add_gateway(gateway_owner, good_gateway_bond(), &mut deps);
-            let delegation_owner1 = Addr::unchecked("sender1");
-            let delegation_owner2 = Addr::unchecked("sender2");
-
-            let delegation1 = coin(123, DENOM);
-            let delegation2 = coin(234, DENOM);
-
-            assert!(try_delegate_to_gateway(
-                deps.as_mut(),
-                mock_env(),
-                mock_info(delegation_owner1.as_str(), &vec![delegation1.clone()]),
-                identity.clone()
-            )
-            .is_ok());
-
-            assert!(try_delegate_to_gateway(
-                deps.as_mut(),
-                mock_env(),
-                mock_info(delegation_owner2.as_str(), &vec![delegation2.clone()]),
-                identity.clone()
-            )
-            .is_ok());
-
-            // sender1 undelegates
-            try_remove_delegation_from_gateway(
-                deps.as_mut(),
-                mock_info(delegation_owner1.as_str(), &[]),
-                identity.clone(),
-            )
-            .unwrap();
-
-            // but total delegation should still equal to what sender2 sent
-            // node's "total_delegation" is sum of both
-            assert_eq!(
-                delegation2,
-                gateways_read(&deps.storage)
-                    .load(identity.as_bytes())
-                    .unwrap()
-                    .total_delegation
-            )
-        }
-    }
-
-    #[test]
-    fn delegators_on_gateway_reward_rate() {
-        let mut deps = helpers::init_contract();
-        let mut env = mock_env();
-        let current_state = config(deps.as_mut().storage).load().unwrap();
-        let network_monitor_address = current_state.network_monitor_address;
-
-        let initial_gateway_bond = 100_000000;
-        let initial_delegation1 = 50000; // will see single digits rewards
-        let initial_delegation2 = 100; // won't see any rewards due to such a small delegation
-        let initial_delegation3 = 100000_000000; // will see big proper rewards
-
-        let node_owner = "node-owner";
-        let identity = add_gateway(node_owner, good_gateway_bond(), &mut deps);
-
-        gateway_delegations(&mut deps.storage, &identity)
-            .save(b"delegator1", &raw_delegation_fixture(initial_delegation1))
-            .unwrap();
-        gateway_delegations(&mut deps.storage, &identity)
-            .save(b"delegator2", &raw_delegation_fixture(initial_delegation2))
-            .unwrap();
-        gateway_delegations(&mut deps.storage, &identity)
-            .save(b"delegator3", &raw_delegation_fixture(initial_delegation3))
-            .unwrap();
-
-        env.block.height += 2 * MINIMUM_BLOCK_AGE_FOR_REWARDING;
-
-        let bond_reward = read_gateway_epoch_bond_reward_rate(deps.as_ref().storage);
-        let delegation_reward = read_gateway_epoch_delegation_reward_rate(deps.as_ref().storage);
-
-        // the node's bond and delegations are correctly increased and scaled by uptime
-        // if node was 100% up, it will get full epoch reward
-        let expected_gateway_reward = Uint128(initial_gateway_bond) * bond_reward;
-        let expected_delegation1_reward = Uint128(initial_delegation1) * delegation_reward;
-        let expected_delegation2_reward = Uint128(initial_delegation2) * delegation_reward;
-        let expected_delegation3_reward = Uint128(initial_delegation3) * delegation_reward;
-
-        let expected_bond = expected_gateway_reward + Uint128(initial_gateway_bond);
-        let expected_delegation1 = expected_delegation1_reward + Uint128(initial_delegation1);
-        let expected_delegation2 = expected_delegation2_reward + Uint128(initial_delegation2);
-        let expected_delegation3 = expected_delegation3_reward + Uint128(initial_delegation3);
-
-        let info = mock_info(network_monitor_address.as_ref(), &[]);
-        let res =
-            try_reward_gateway(deps.as_mut(), env.clone(), info, identity.clone(), 100).unwrap();
-
-        assert_eq!(
-            expected_bond,
-            read_gateway_bond(deps.as_ref().storage, identity.as_bytes()).unwrap()
-        );
-
-        assert_eq!(
-            expected_delegation1,
-            gateway_delegations_read(deps.as_ref().storage, &identity)
-                .load("delegator1".as_bytes())
-                .unwrap()
-                .amount
-        );
-
-        assert_eq!(
-            expected_delegation2,
-            gateway_delegations_read(deps.as_ref().storage, &identity)
-                .load("delegator2".as_bytes())
-                .unwrap()
-                .amount
-        );
-
-        assert_eq!(
-            expected_delegation3,
-            gateway_delegations_read(deps.as_ref().storage, &identity)
-                .load("delegator3".as_bytes())
-                .unwrap()
-                .amount
-        );
-
-        assert_eq!(
-            vec![
-                attr("bond increase", expected_gateway_reward),
-                attr(
-                    "total delegation increase",
-                    expected_delegation1_reward
-                        + expected_delegation2_reward
-                        + expected_delegation3_reward
-                ),
-            ],
-            res.attributes
-        );
-
-        // if node was 20% up, it will get 1/5th of epoch reward
-        let scaled_bond_reward = scale_reward_by_uptime(bond_reward, 20).unwrap();
-        let scaled_delegation_reward = scale_reward_by_uptime(delegation_reward, 20).unwrap();
-
-        let expected_gateway_reward = expected_bond * scaled_bond_reward;
-        let expected_delegation1_reward = expected_delegation1 * scaled_delegation_reward;
-        let expected_delegation2_reward = expected_delegation2 * scaled_delegation_reward;
-        let expected_delegation3_reward = expected_delegation3 * scaled_delegation_reward;
-
-        let expected_bond = expected_gateway_reward + expected_bond;
-        let expected_delegation1 = expected_delegation1_reward + expected_delegation1;
-        let expected_delegation2 = expected_delegation2_reward + expected_delegation2;
-        let expected_delegation3 = expected_delegation3_reward + expected_delegation3;
-
-        let info = mock_info(network_monitor_address.as_ref(), &[]);
-        let res =
-            try_reward_gateway(deps.as_mut(), env.clone(), info, identity.clone(), 20).unwrap();
-
-        assert_eq!(
-            expected_bond,
-            read_gateway_bond(deps.as_ref().storage, identity.as_bytes()).unwrap()
-        );
-
-        assert_eq!(
-            expected_delegation1,
-            gateway_delegations_read(deps.as_ref().storage, &identity)
-                .load("delegator1".as_bytes())
-                .unwrap()
-                .amount
-        );
-
-        assert_eq!(
-            expected_delegation2,
-            gateway_delegations_read(deps.as_ref().storage, &identity)
-                .load("delegator2".as_bytes())
-                .unwrap()
-                .amount
-        );
-
-        assert_eq!(
-            expected_delegation3,
-            gateway_delegations_read(deps.as_ref().storage, &identity)
-                .load("delegator3".as_bytes())
-                .unwrap()
-                .amount
-        );
-
-        assert_eq!(
-            vec![
-                attr("bond increase", expected_gateway_reward),
-                attr(
-                    "total delegation increase",
-                    expected_delegation1_reward
-                        + expected_delegation2_reward
-                        + expected_delegation3_reward
-                ),
-            ],
-            res.attributes
-        );
-
-        // if the node was 0% up, nobody will get any rewards
-        let info = mock_info(network_monitor_address.as_ref(), &[]);
-        let res =
-            try_reward_gateway(deps.as_mut(), env.clone(), info, identity.clone(), 0).unwrap();
-
-        assert_eq!(
-            expected_bond,
-            read_gateway_bond(deps.as_ref().storage, identity.as_bytes()).unwrap()
-        );
-
-        assert_eq!(
-            expected_delegation1,
-            gateway_delegations_read(deps.as_ref().storage, &identity)
-                .load("delegator1".as_bytes())
-                .unwrap()
-                .amount
-        );
-
-        assert_eq!(
-            expected_delegation2,
-            gateway_delegations_read(deps.as_ref().storage, &identity)
-                .load("delegator2".as_bytes())
-                .unwrap()
-                .amount
-        );
-
-        assert_eq!(
-            expected_delegation3,
-            gateway_delegations_read(deps.as_ref().storage, &identity)
-                .load("delegator3".as_bytes())
-                .unwrap()
-                .amount
-        );
-
-        assert_eq!(
-            vec![
-                attr("bond increase", Uint128(0)),
-                attr("total delegation increase", Uint128(0)),
-            ],
-            res.attributes
-        );
-    }
-
     #[test]
     fn multiple_page_delegations() {
         let mut deps = helpers::init_contract();
@@ -3911,19 +2577,6 @@ pub mod tests {
             DELEGATION_PAGE_DEFAULT_LIMIT * 10,
             mix_delegations.len() as u32
         );
-
-        store_n_gateway_delegations(
-            DELEGATION_PAGE_DEFAULT_LIMIT * 10,
-            &mut deps.storage,
-            &node_identity,
-        );
-        let gateway_bucket = all_gateway_delegations_read::<RawDelegationData>(&deps.storage);
-        let gateway_delegations = Delegations::new(gateway_bucket)
-            .collect::<Vec<UnpackedDelegation<RawDelegationData>>>();
-        assert_eq!(
-            DELEGATION_PAGE_DEFAULT_LIMIT * 10,
-            gateway_delegations.len() as u32
-        );
     }
 
     #[cfg(test)]
diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml
index 384b28b720..272ee47925 100644
--- a/gateway/Cargo.toml
+++ b/gateway/Cargo.toml
@@ -6,6 +6,7 @@ name = "nym-gateway"
 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
 
diff --git a/mixnode/Cargo.toml b/mixnode/Cargo.toml
index 968df4a9e1..9100df26ef 100644
--- a/mixnode/Cargo.toml
+++ b/mixnode/Cargo.toml
@@ -10,6 +10,7 @@ authors = [
     "Drazen Urch <durch@users.noreply.github.com>",
 ]
 edition = "2018"
+rust-version = "1.56"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/tauri-wallet/Cargo.lock b/tauri-wallet/Cargo.lock
index 43097c64a4..8e846a0cc1 100644
--- a/tauri-wallet/Cargo.lock
+++ b/tauri-wallet/Cargo.lock
@@ -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"
@@ -42,15 +33,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 = "anyhow"
 version = "1.0.43"
@@ -148,21 +130,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
-[[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 = "base64"
 version = "0.13.0"
@@ -430,12 +397,9 @@ version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
 dependencies = [
- "libc",
  "num-integer",
  "num-traits",
  "serde",
- "time 0.1.43",
- "winapi",
 ]
 
 [[package]]
@@ -632,9 +596,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",
@@ -643,9 +607,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",
@@ -656,6 +620,8 @@ dependencies = [
  "prost",
  "prost-types",
  "rand_core 0.6.3",
+ "serde",
+ "serde_json",
  "subtle-encoding",
  "tendermint",
  "tendermint-rpc",
@@ -1077,7 +1043,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4620d40f6d2601794401d6dd95a5cf69b6c157852539470eeda433a99b3c0efc"
 dependencies = [
- "serde",
  "signature",
 ]
 
@@ -1089,9 +1054,6 @@ checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
 dependencies = [
  "curve25519-dalek",
  "ed25519",
- "rand 0.7.3",
- "serde",
- "serde_bytes",
  "sha2",
  "zeroize",
 ]
@@ -1228,6 +1190,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 = "fnv"
 version = "1.0.7"
@@ -1531,12 +1503,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.5"
@@ -1976,6 +1942,7 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "webpki",
+ "webpki-roots",
 ]
 
 [[package]]
@@ -2098,15 +2065,6 @@ dependencies = [
  "syn",
 ]
 
-[[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"
@@ -2610,15 +2568,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 = "once_cell"
 version = "1.8.0"
@@ -2744,6 +2693,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"
@@ -2753,6 +2708,33 @@ dependencies = [
  "crypto-mac",
 ]
 
+[[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 = "percent-encoding"
 version = "2.1.0"
@@ -3061,9 +3043,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",
@@ -3071,12 +3053,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",
@@ -3084,9 +3066,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",
@@ -3476,12 +3458,6 @@ dependencies = [
  "opaque-debug 0.3.0",
 ]
 
-[[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.3.3"
@@ -4193,7 +4169,7 @@ dependencies = [
  "anyhow",
  "cfg-expr",
  "heck",
- "itertools 0.10.1",
+ "itertools",
  "pkg-config",
  "strum 0.21.0",
  "strum_macros 0.21.1",
@@ -4408,16 +4384,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",
@@ -4434,21 +4410,32 @@ dependencies = [
  "subtle",
  "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",
@@ -4456,30 +4443,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",
@@ -4656,21 +4645,9 @@ checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
 dependencies = [
  "cfg-if 1.0.0",
  "pin-project-lite",
- "tracing-attributes",
  "tracing-core",
 ]
 
-[[package]]
-name = "tracing-attributes"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "tracing-core"
 version = "0.1.19"
@@ -4812,7 +4789,7 @@ dependencies = [
  "cosmrs",
  "cosmwasm-std",
  "flate2",
- "itertools 0.10.1",
+ "itertools",
  "log",
  "mixnet-contract",
  "network-defaults",
@@ -5023,6 +5000,15 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "webpki-roots"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
+dependencies = [
+ "webpki",
+]
+
 [[package]]
 name = "webview2"
 version = "0.1.1"
diff --git a/tauri-wallet/README.md b/tauri-wallet/README.md
index 465cd18132..5cd0fdd60a 100644
--- a/tauri-wallet/README.md
+++ b/tauri-wallet/README.md
@@ -7,12 +7,19 @@ SPDX-License-Identifier: Apache-2.0
 
 A Rust and Tauri desktop wallet implementation.
 
-## Installation prerequisites
+## Installation prerequisites Linux / Mac
 
 - `Yarn`
 - `NodeJS >= v16.8.0`
 - `Rust & cargo >= v1.51`
 
+## Installation prerequisites Windows
+
+- When running on Windows you will need to install c++ build tools
+- An easy guide to get rust up and running [Installation]("http://kennykerr.ca/2019/11/18/rust-getting-started/")
+- When installing NodeJS please use the `current features` version
+- Using a package manager like [Chocolatey]("chocolatey.org") is recommended
+
 ## Installation
 
 Inside of the `tauri-wallet` folder, run the following commands
diff --git a/tauri-wallet/src-tauri/Cargo.toml b/tauri-wallet/src-tauri/Cargo.toml
index 9737017ee4..5689dec128 100644
--- a/tauri-wallet/src-tauri/Cargo.toml
+++ b/tauri-wallet/src-tauri/Cargo.toml
@@ -8,6 +8,7 @@ repository = ""
 default-run = "nym_wallet"
 edition = "2018"
 build = "src/build.rs"
+rust-version = "1.56"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -23,12 +24,12 @@ dirs = "3.0"
 # url = "2.2"
 bip39 = "1.0"
 thiserror = "1.0"
-tendermint-rpc = "0.21.0"
+tendermint-rpc = "0.23.0"
 ts-rs = "3.0"
 url = "2.0"
 rand = "0.6.5"
 
-cosmrs = { version = "0.1", features = ["rpc", "bip32", "cosmwasm"] }
+cosmrs = { version = "0.3", features = ["rpc", "bip32", "cosmwasm"] }
 cosmwasm-std = { git = "https://github.com/jstuczyn/cosmwasm", branch = "0.14.1-updatedk256" }
 
 validator-client = { path = "../../common/client-libs/validator-client", features = [
diff --git a/tauri-wallet/src-tauri/src/main.rs b/tauri-wallet/src-tauri/src/main.rs
index 28aecff021..8ac9f6c423 100644
--- a/tauri-wallet/src-tauri/src/main.rs
+++ b/tauri-wallet/src-tauri/src/main.rs
@@ -5,6 +5,7 @@
 
 use mixnet_contract::{Gateway, MixNode};
 use std::sync::Arc;
+use tauri::{Menu, MenuItem};
 use tokio::sync::RwLock;
 use ts_rs::export;
 use validator_client::nymd::fee_helpers::Operation;
@@ -35,6 +36,12 @@ macro_rules! format_err {
   };
 }
 
+pub fn create_menu_items() -> Menu {
+  Menu::new()
+    .add_native_item(MenuItem::Copy)
+    .add_native_item(MenuItem::Paste)
+}
+
 fn main() {
   tauri::Builder::default()
     .manage(Arc::new(RwLock::new(State::default())))
@@ -51,16 +58,14 @@ fn main() {
       unbond_gateway,
       delegate_to_mixnode,
       undelegate_from_mixnode,
-      delegate_to_gateway,
-      undelegate_from_gateway,
       send,
       create_new_account,
       get_fee,
       get_state_params,
       update_state_params,
       get_reverse_mix_delegations_paged,
-      get_reverse_gateway_delegations_paged,
     ])
+    .menu(create_menu_items())
     .run(tauri::generate_context!())
     .expect("error while running tauri application");
 }
diff --git a/tauri-wallet/src-tauri/src/operations/admin.rs b/tauri-wallet/src-tauri/src/operations/admin.rs
index 2d3ad52ae7..71ac69af8a 100644
--- a/tauri-wallet/src-tauri/src/operations/admin.rs
+++ b/tauri-wallet/src-tauri/src/operations/admin.rs
@@ -16,11 +16,8 @@ pub struct TauriStateParams {
   minimum_mixnode_bond: String,
   minimum_gateway_bond: String,
   mixnode_bond_reward_rate: String,
-  gateway_bond_reward_rate: String,
   mixnode_delegation_reward_rate: String,
-  gateway_delegation_reward_rate: String,
   mixnode_active_set_size: u32,
-  gateway_active_set_size: u32,
 }
 
 impl From<StateParams> for TauriStateParams {
@@ -30,11 +27,8 @@ impl From<StateParams> for TauriStateParams {
       minimum_mixnode_bond: p.minimum_mixnode_bond.to_string(),
       minimum_gateway_bond: p.minimum_gateway_bond.to_string(),
       mixnode_bond_reward_rate: p.mixnode_bond_reward_rate.to_string(),
-      gateway_bond_reward_rate: p.gateway_bond_reward_rate.to_string(),
       mixnode_delegation_reward_rate: p.mixnode_delegation_reward_rate.to_string(),
-      gateway_delegation_reward_rate: p.gateway_delegation_reward_rate.to_string(),
       mixnode_active_set_size: p.mixnode_active_set_size,
-      gateway_active_set_size: p.gateway_active_set_size,
     }
   }
 }
@@ -48,11 +42,8 @@ impl TryFrom<TauriStateParams> for StateParams {
       minimum_mixnode_bond: Uint128::try_from(p.minimum_mixnode_bond.as_str())?,
       minimum_gateway_bond: Uint128::try_from(p.minimum_gateway_bond.as_str())?,
       mixnode_bond_reward_rate: Decimal::from_str(p.mixnode_bond_reward_rate.as_str())?,
-      gateway_bond_reward_rate: Decimal::from_str(p.gateway_bond_reward_rate.as_str())?,
       mixnode_delegation_reward_rate: Decimal::from_str(p.mixnode_delegation_reward_rate.as_str())?,
-      gateway_delegation_reward_rate: Decimal::from_str(p.gateway_delegation_reward_rate.as_str())?,
       mixnode_active_set_size: p.mixnode_active_set_size,
-      gateway_active_set_size: p.gateway_active_set_size,
     })
   }
 }
diff --git a/tauri-wallet/src-tauri/src/operations/delegate.rs b/tauri-wallet/src-tauri/src/operations/delegate.rs
index bba966ebec..a9c9a75269 100644
--- a/tauri-wallet/src-tauri/src/operations/delegate.rs
+++ b/tauri-wallet/src-tauri/src/operations/delegate.rs
@@ -2,9 +2,7 @@ use crate::coin::Coin;
 use crate::format_err;
 use crate::state::State;
 use cosmwasm_std::Coin as CosmWasmCoin;
-use mixnet_contract::{
-  Addr, PagedReverseGatewayDelegationsResponse, PagedReverseMixDelegationsResponse,
-};
+use mixnet_contract::{Addr, PagedReverseMixDelegationsResponse};
 use serde::{Deserialize, Serialize};
 use std::convert::TryInto;
 use std::sync::Arc;
@@ -57,45 +55,6 @@ pub async fn undelegate_from_mixnode(
   }
 }
 
-#[tauri::command]
-pub async fn delegate_to_gateway(
-  identity: &str,
-  amount: Coin,
-  state: tauri::State<'_, Arc<RwLock<State>>>,
-) -> Result<DelegationResult, String> {
-  let r_state = state.read().await;
-  let bond: CosmWasmCoin = match amount.try_into() {
-    Ok(b) => b,
-    Err(e) => return Err(format_err!(e)),
-  };
-  let client = r_state.client()?;
-  match client.delegate_to_gateway(identity, &bond).await {
-    Ok(_result) => Ok(DelegationResult {
-      source_address: client.address().to_string(),
-      target_address: identity.to_string(),
-      amount: Some(bond.into()),
-    }),
-    Err(e) => Err(format_err!(e)),
-  }
-}
-
-#[tauri::command]
-pub async fn undelegate_from_gateway(
-  identity: &str,
-  state: tauri::State<'_, Arc<RwLock<State>>>,
-) -> Result<DelegationResult, String> {
-  let r_state = state.read().await;
-  let client = r_state.client()?;
-  match client.remove_gateway_delegation(identity).await {
-    Ok(_result) => Ok(DelegationResult {
-      source_address: client.address().to_string(),
-      target_address: identity.to_string(),
-      amount: None,
-    }),
-    Err(e) => Err(format_err!(e)),
-  }
-}
-
 #[tauri::command]
 pub async fn get_reverse_mix_delegations_paged(
   state: tauri::State<'_, Arc<RwLock<State>>>,
@@ -104,16 +63,6 @@ pub async fn get_reverse_mix_delegations_paged(
   let client = r_state.client()?;
   client
     .get_reverse_mix_delegations_paged(Addr::unchecked(client.address().as_ref()), None, None)
-    .await.map_err(|err| format_err!(err))
-}
-
-#[tauri::command]
-pub async fn get_reverse_gateway_delegations_paged(
-  state: tauri::State<'_, Arc<RwLock<State>>>,
-) -> Result<PagedReverseGatewayDelegationsResponse, String> {
-  let r_state = state.read().await;
-  let client = r_state.client()?;
-  client
-    .get_reverse_gateway_delegations_paged(Addr::unchecked(client.address().as_ref()), None, None)
-    .await.map_err(|err| format_err!(err))
+    .await
+    .map_err(|err| format_err!(err))
 }
diff --git a/tauri-wallet/src/components/Confirmation.tsx b/tauri-wallet/src/components/Confirmation.tsx
index 593eed90af..e227021d0b 100644
--- a/tauri-wallet/src/components/Confirmation.tsx
+++ b/tauri-wallet/src/components/Confirmation.tsx
@@ -33,7 +33,7 @@ export const Confirmation = ({
       {error === null ? (
         SuccessMessage
       ) : (
-        <Alert severity="error">
+        <Alert severity="error" data-testid="error-message">
           <AlertTitle>{error.name}</AlertTitle>
           <strong>{failureMessage}</strong> - {error.message}
         </Alert>
diff --git a/tauri-wallet/src/components/CopyToClipboard.tsx b/tauri-wallet/src/components/CopyToClipboard.tsx
index c1c6da79d2..9e4cd4ae71 100644
--- a/tauri-wallet/src/components/CopyToClipboard.tsx
+++ b/tauri-wallet/src/components/CopyToClipboard.tsx
@@ -40,6 +40,7 @@ export const CopyToClipboard = ({ text }: { text: string }) => {
       size="small"
       variant={copied ? 'text' : 'outlined'}
       aria-label="save"
+      data-testid="copy-button"
       onClick={() => handleCopy({ text, cb: updateCopyStatus })}
       endIcon={copied && <Check />}
       style={copied ? { background: green[500], color: 'white' } : {}}
diff --git a/tauri-wallet/src/components/Error.tsx b/tauri-wallet/src/components/Error.tsx
index 0537674d8b..d1947bac31 100644
--- a/tauri-wallet/src/components/Error.tsx
+++ b/tauri-wallet/src/components/Error.tsx
@@ -6,11 +6,11 @@ import { Button } from '@material-ui/core'
 export const ErrorFallback = ({ error, resetErrorBoundary }: FallbackProps) => {
   return (
     <div>
-      <Alert severity="error">
+      <Alert severity="error" data-testid="error-message">
         <AlertTitle>{error.name}</AlertTitle>
         {error.message}
       </Alert>
-      <Alert severity="error">
+      <Alert severity="error" data-testid="stack-trace">
         <AlertTitle>Stack trace</AlertTitle>
         {error.stack}
       </Alert>
diff --git a/tauri-wallet/src/components/Nav.tsx b/tauri-wallet/src/components/Nav.tsx
index 3e870e4edd..4af636f53f 100644
--- a/tauri-wallet/src/components/Nav.tsx
+++ b/tauri-wallet/src/components/Nav.tsx
@@ -131,7 +131,7 @@ export const Nav = () => {
         )}
 
         <ListItem button onClick={logOut}>
-          <ListItemIcon className={classes.navItem}>
+          <ListItemIcon data-testid="log-out" className={classes.navItem}>
             <ExitToApp />
           </ListItemIcon>
           <ListItemText
diff --git a/tauri-wallet/src/components/NavigationCards.tsx b/tauri-wallet/src/components/NavigationCards.tsx
index 89e842b69e..05fa151c5e 100644
--- a/tauri-wallet/src/components/NavigationCards.tsx
+++ b/tauri-wallet/src/components/NavigationCards.tsx
@@ -28,7 +28,7 @@ export const BalanceCard = () => {
         noPadding
         Action={
           <Tooltip title="Refresh balance">
-            <IconButton onClick={getBalance.fetchBalance} size="small">
+            <IconButton data-testid="refresh-balance" onClick={getBalance.fetchBalance} size="small">
               <Refresh />
             </IconButton>
           </Tooltip>
@@ -43,7 +43,7 @@ export const BalanceCard = () => {
                 {getBalance.error}
               </Alert>
             ) : (
-              <Typography variant="h6">
+              <Typography variant="h6" data-testid="account-balance">
                 {getBalance.balance?.printable_balance}
               </Typography>
             )}
@@ -71,6 +71,7 @@ export const AddressCard = () => {
         title="Address"
         subheader="Wallet payments address"
         noPadding
+        data-testid="wallet-address-header"
         Action={
           <Tooltip title={!copyState ? 'Copy address' : 'Copied'}>
             <span>
@@ -106,7 +107,7 @@ export const AddressCard = () => {
         }
       >
         <CardContent>
-          <Typography
+          <Typography data-testid="wallet-address"
             style={{ fontWeight: theme.typography.fontWeightRegular }}
           >
             {truncate(clientDetails?.client_address!, 35)}
diff --git a/tauri-wallet/src/components/NoClientError.tsx b/tauri-wallet/src/components/NoClientError.tsx
index 9e1022babb..cf65ae0904 100644
--- a/tauri-wallet/src/components/NoClientError.tsx
+++ b/tauri-wallet/src/components/NoClientError.tsx
@@ -5,7 +5,7 @@ import { Alert, AlertTitle } from '@material-ui/lab'
 export const NoClientError = () => {
   return (
     <Alert severity="error">
-      <AlertTitle>No client detected</AlertTitle>
+      <AlertTitle data-testid="client-error">No client detected</AlertTitle>
       Have you signed in? Try to go back to{' '}
       <Link to="/signin">the main page</Link> and try again
     </Alert>
diff --git a/tauri-wallet/src/components/NodeTypeSelector.tsx b/tauri-wallet/src/components/NodeTypeSelector.tsx
index b949eb00d3..e36432a637 100644
--- a/tauri-wallet/src/components/NodeTypeSelector.tsx
+++ b/tauri-wallet/src/components/NodeTypeSelector.tsx
@@ -34,11 +34,13 @@ export const NodeTypeSelector = ({
           value={EnumNodeType.mixnode}
           control={<Radio />}
           label="Mixnode"
+          data-testid="mix-node"
           disabled={disabled}
         />
         <FormControlLabel
           value={EnumNodeType.gateway}
           control={<Radio />}
+          data-testid="gate-way"
           label="Gateway"
           disabled={disabled}
         />
diff --git a/tauri-wallet/src/components/NymCard.tsx b/tauri-wallet/src/components/NymCard.tsx
index c77fe38359..162610b15b 100644
--- a/tauri-wallet/src/components/NymCard.tsx
+++ b/tauri-wallet/src/components/NymCard.tsx
@@ -13,6 +13,7 @@ export const NymCard: React.FC<{
       <CardHeader
         title={title}
         subheader={subheader}
+        data-testid={title}
         titleTypographyProps={{ variant: 'h5' }}
         subheaderTypographyProps={{ variant: 'subtitle1' }}
         action={Action}
diff --git a/tauri-wallet/src/routes/balance.tsx b/tauri-wallet/src/routes/balance.tsx
index b14fba3270..488890c3bf 100644
--- a/tauri-wallet/src/routes/balance.tsx
+++ b/tauri-wallet/src/routes/balance.tsx
@@ -18,6 +18,7 @@ export const Balance = () => {
       size="small"
       color="primary"
       type="submit"
+      data-testid="refresh-button"
       onClick={fetchBalance}
       disabled={isLoading}
       disableElevation
@@ -31,12 +32,13 @@ export const Balance = () => {
 
   return (
     <Layout>
-      <NymCard title="Check Balance">
+      <NymCard title="Check Balance" data-testid="check-balance">
         <Grid container direction="column" spacing={2}>
           <Grid item>
             {error && (
               <Alert
                 severity="error"
+                data-testid="error-refresh"
                 action={<RefreshAction />}
                 style={{ padding: theme.spacing(2) }}
               >
@@ -46,6 +48,7 @@ export const Balance = () => {
             {!error && (
               <Alert
                 severity="success"
+                data-testid="refresh-success"
                 style={{ padding: theme.spacing(2, 3) }}
                 action={<RefreshAction />}
               >
diff --git a/tauri-wallet/src/routes/bond/BondForm.tsx b/tauri-wallet/src/routes/bond/BondForm.tsx
index 8d1152bed9..ea689aa7db 100644
--- a/tauri-wallet/src/routes/bond/BondForm.tsx
+++ b/tauri-wallet/src/routes/bond/BondForm.tsx
@@ -142,7 +142,7 @@ export const BondForm = ({
             </Grid>
             {fees && (
               <Grid item>
-                <Alert severity="info">
+                <Alert severity="info" data-testid="fee-amount">
                   {`A fee of ${
                     watchNodeType === EnumNodeType.mixnode
                       ? fees.mixnode.amount
@@ -369,6 +369,7 @@ export const BondForm = ({
           color="primary"
           type="submit"
           size="large"
+          data-testid="submit-button"
           disableElevation
           onClick={handleSubmit(onSubmit)}
           endIcon={isSubmitting && <CircularProgress size={20} />}
diff --git a/tauri-wallet/src/routes/bond/index.tsx b/tauri-wallet/src/routes/bond/index.tsx
index 1c06f9051e..0e89ae070f 100644
--- a/tauri-wallet/src/routes/bond/index.tsx
+++ b/tauri-wallet/src/routes/bond/index.tsx
@@ -43,7 +43,7 @@ export const Bond = () => {
       <NymCard title="Bond" subheader="Bond a node or gateway" noPadding>
         {ownership?.hasOwnership && (
           <Alert
-            severity="warning"
+            severity="warning" 
             action={
               <Button
                 disabled={status === EnumRequestStatus.loading}
@@ -53,6 +53,7 @@ export const Bond = () => {
                   getBalance.fetchBalance()
                   setStatus(EnumRequestStatus.initial)
                 }}
+                data-testid="unBond"
               >
                 Unbond
               </Button>
@@ -93,10 +94,10 @@ export const Bond = () => {
             <RequestStatus
               status={status}
               Success={
-                <Alert severity="success">Successfully bonded node</Alert>
+                <Alert severity="success" data-testid="bond-success">Successfully bonded node</Alert>
               }
               Error={
-                <Alert severity="error">
+                <Alert severity="error" data-testid="bond-error">
                   An error occurred with the request: {message}
                 </Alert>
               }
diff --git a/tauri-wallet/src/routes/delegate/DelegateForm.tsx b/tauri-wallet/src/routes/delegate/DelegateForm.tsx
index 50fb7a4929..0a32c08395 100644
--- a/tauri-wallet/src/routes/delegate/DelegateForm.tsx
+++ b/tauri-wallet/src/routes/delegate/DelegateForm.tsx
@@ -97,7 +97,7 @@ export const DelegateForm = ({
               />
             </Grid>
             <Grid item>
-              <Alert severity="info">
+              <Alert severity="info" data-testid="fee-amount">
                 {`A fee of ${
                   watchNodeType === EnumNodeType.mixnode
                     ? fees.mixnode.amount
@@ -153,6 +153,7 @@ export const DelegateForm = ({
         <Button
           onClick={handleSubmit(onSubmit)}
           disabled={isSubmitting}
+          data-testid="delegate-button"
           variant="contained"
           color="primary"
           type="submit"
diff --git a/tauri-wallet/src/routes/delegate/index.tsx b/tauri-wallet/src/routes/delegate/index.tsx
index 729e85cdd0..e744dacab0 100644
--- a/tauri-wallet/src/routes/delegate/index.tsx
+++ b/tauri-wallet/src/routes/delegate/index.tsx
@@ -41,6 +41,7 @@ export const Delegate = () => {
         title="Delegate"
         subheader="Delegate to mixnode or gateway"
         noPadding
+        data-testid="delegateCard"
       >
         {isLoading && (
           <Box
@@ -72,15 +73,16 @@ export const Delegate = () => {
               <RequestStatus
                 status={status}
                 Error={
-                  <Alert severity="error">
+                  <Alert severity="error" data-testid="delegate-error">
+                    <AlertTitle>Delegation failed</AlertTitle>
                     An error occurred with the request:
                     <Box style={{ wordBreak: 'break-word' }}>{message}</Box>
                   </Alert>
                 }
                 Success={
-                  <Alert severity="success">
+                  <Alert severity="success" data-testid="delegate-success">
                     <AlertTitle>Delegation complete</AlertTitle>
-                    {message}
+                    <Box style={{ wordBreak: 'break-word' }}>{message}</Box>
                   </Alert>
                 }
               />
@@ -95,6 +97,7 @@ export const Delegate = () => {
                 }}
               >
                 <Button
+                  data-testid="finish-button"
                   onClick={() => {
                     setStatus(EnumRequestStatus.initial)
                   }}
diff --git a/tauri-wallet/src/routes/receive.tsx b/tauri-wallet/src/routes/receive.tsx
index 4037228255..2e4f523b04 100644
--- a/tauri-wallet/src/routes/receive.tsx
+++ b/tauri-wallet/src/routes/receive.tsx
@@ -17,7 +17,7 @@ export const Receive = () => {
       <NymCard title="Receive Nym">
         <Grid container direction="column" spacing={1}>
           <Grid item>
-            <Alert severity="info">
+            <Alert severity="info" data-testid="receive-nym">
               You can receive tokens by providing this address to the sender
             </Alert>
           </Grid>
@@ -40,6 +40,7 @@ export const Receive = () => {
               >
                 <Grid item>
                   <Typography
+                    data-testid="client-address"
                     variant={matches ? 'h5' : 'subtitle1'}
                     style={{
                       wordBreak: 'break-word',
@@ -61,7 +62,7 @@ export const Receive = () => {
                     component="div"
                   >
                     {clientDetails && (
-                      <QRCode value={clientDetails.client_address} />
+                      <QRCode data-testid="qr-code" value={clientDetails.client_address} />
                     )}
                   </Box>
                 </Grid>
diff --git a/tauri-wallet/src/routes/send/SendConfirmation.tsx b/tauri-wallet/src/routes/send/SendConfirmation.tsx
index 4b19369641..8cfefdcd28 100644
--- a/tauri-wallet/src/routes/send/SendConfirmation.tsx
+++ b/tauri-wallet/src/routes/send/SendConfirmation.tsx
@@ -46,7 +46,7 @@ export const SendConfirmation = ({
                 marginBottom: theme.spacing(1),
               }}
             />
-            <Typography>Transaction complete</Typography>
+            <Typography data-testid="transaction-complete">Transaction complete</Typography>
           </div>
 
           <Card
@@ -60,7 +60,7 @@ export const SendConfirmation = ({
                 </Typography>
               </div>
               <div style={{ wordBreak: 'break-all' }}>
-                <Typography>{data.to_address}</Typography>
+                <Typography data-testid="to-address">{data.to_address}</Typography>
               </div>
             </div>
             <div style={{ display: 'flex' }}>
@@ -70,7 +70,7 @@ export const SendConfirmation = ({
                 </Typography>
               </div>
               <div>
-                <Typography>{data.amount.amount + ' punks'}</Typography>
+                <Typography data-testid="send-amount">{data.amount.amount + ' punks'}</Typography>
               </div>
             </div>
           </Card>
diff --git a/tauri-wallet/src/routes/send/SendError.tsx b/tauri-wallet/src/routes/send/SendError.tsx
index 2fcb9ce5be..f90c9b9df5 100644
--- a/tauri-wallet/src/routes/send/SendError.tsx
+++ b/tauri-wallet/src/routes/send/SendError.tsx
@@ -37,7 +37,7 @@ export const SendError = ({ message }: { message?: string }) => {
           variant="outlined"
           style={{ width: '100%', padding: theme.spacing(2) }}
         >
-          <Alert severity="error">
+          <Alert severity="error" data-testid="transaction-error">
             An error occured during the request {message}
           </Alert>
         </Card>
diff --git a/tauri-wallet/src/routes/send/SendReview.tsx b/tauri-wallet/src/routes/send/SendReview.tsx
index e9d0e23095..b51edc1626 100644
--- a/tauri-wallet/src/routes/send/SendReview.tsx
+++ b/tauri-wallet/src/routes/send/SendReview.tsx
@@ -44,7 +44,7 @@ export const SendReview = () => {
       ) : (
         <Grid container spacing={2}>
           <Grid item xs={12}>
-            <SendReviewField title="From" subtitle={values.from} />
+            <SendReviewField title="From" subtitle={values.from}/>
           </Grid>
           <Grid item xs={12}>
             <Divider light />
@@ -86,7 +86,7 @@ export const SendReviewField = ({
       <Typography style={{ color: theme.palette.grey[600] }}>
         {title}
       </Typography>
-      <Typography style={{ wordBreak: 'break-all' }}>{subtitle}</Typography>
+      <Typography data-testid={title} style={{ wordBreak: 'break-all' }}>{subtitle}</Typography>
     </>
   )
 }
diff --git a/tauri-wallet/src/routes/send/SendWizard.tsx b/tauri-wallet/src/routes/send/SendWizard.tsx
index ee03bab9aa..2f41946157 100644
--- a/tauri-wallet/src/routes/send/SendWizard.tsx
+++ b/tauri-wallet/src/routes/send/SendWizard.tsx
@@ -148,6 +148,7 @@ export const SendWizard = () => {
               disableElevation
               style={{ marginRight: theme.spacing(1) }}
               onClick={handlePreviousStep}
+              data-testid="back-button"
             >
               Back
             </Button>
@@ -156,6 +157,7 @@ export const SendWizard = () => {
             variant={activeStep > 0 ? 'contained' : 'text'}
             color={activeStep > 0 ? 'primary' : 'default'}
             disableElevation
+            data-testid="button"
             onClick={
               activeStep === 0
                 ? handleNextStep
diff --git a/tauri-wallet/src/routes/sign-in.tsx b/tauri-wallet/src/routes/sign-in.tsx
index d80a81060f..0cbac9f2ac 100644
--- a/tauri-wallet/src/routes/sign-in.tsx
+++ b/tauri-wallet/src/routes/sign-in.tsx
@@ -100,7 +100,7 @@ const SignInContent = ({
   return (
     <SignInCard>
       <>
-        <Typography variant="h4">Sign in</Typography>
+        <Typography variant="h4" data-testid="sign-in">Sign in</Typography>
         <form noValidate onSubmit={handleSignIn}>
           <Grid container direction="column" spacing={1}>
             <Grid item>
@@ -239,7 +239,7 @@ const CreateAccountContent = ({ showSignIn }: { showSignIn: () => void }) => {
                 />
                 <Typography>Wallet setup complete</Typography>
               </div>
-              <Alert severity="info" style={{ marginBottom: theme.spacing(2) }}>
+              <Alert severity="info" style={{ marginBottom: theme.spacing(2) }} data-testid="mnemonic-warning">
                 Please store your <strong>mnemonic</strong> in a safe place.
                 You'll need it to access your wallet
               </Alert>
@@ -257,7 +257,7 @@ const CreateAccountContent = ({ showSignIn }: { showSignIn: () => void }) => {
                     </Typography>
                   </Grid>
                   <Grid item>
-                    <Typography>{accountDetails.mnemonic}</Typography>
+                    <Typography data-testid="mnemonic-phrase">{accountDetails.mnemonic}</Typography>
                     <div
                       style={{ display: 'flex', justifyContent: 'flex-end' }}
                     >
@@ -273,7 +273,7 @@ const CreateAccountContent = ({ showSignIn }: { showSignIn: () => void }) => {
                     </Typography>
                   </Grid>
                   <Grid item>
-                    <Typography>{accountDetails.client_address}</Typography>
+                    <Typography data-testid="wallet-address">{accountDetails.client_address}</Typography>
                   </Grid>
                 </Grid>
               </Card>
@@ -282,7 +282,7 @@ const CreateAccountContent = ({ showSignIn }: { showSignIn: () => void }) => {
         </Grid>
         {error && (
           <Grid item style={{ marginTop: theme.spacing(1) }}>
-            <Alert severity="error">{error}</Alert>
+            <Alert severity="error" data-testid="error">{error}</Alert>
           </Grid>
         )}
         <Grid item>
@@ -293,6 +293,7 @@ const CreateAccountContent = ({ showSignIn }: { showSignIn: () => void }) => {
               variant="contained"
               color="primary"
               type="submit"
+              data-testid="create-button"
               disableElevation
               style={{ marginBottom: theme.spacing(1) }}
               disabled={isLoading}
@@ -304,6 +305,7 @@ const CreateAccountContent = ({ showSignIn }: { showSignIn: () => void }) => {
             fullWidth
             variant="text"
             onClick={showSignIn}
+            data-testid="sign-in-button"
             startIcon={<ArrowBack />}
           >
             Sign in
diff --git a/tauri-wallet/src/routes/unbond/index.tsx b/tauri-wallet/src/routes/unbond/index.tsx
index 9ae5ed6f01..2edca71138 100644
--- a/tauri-wallet/src/routes/unbond/index.tsx
+++ b/tauri-wallet/src/routes/unbond/index.tsx
@@ -29,8 +29,10 @@ export const Unbond = () => {
         {ownership?.hasOwnership && (
           <Alert
             severity="warning"
+            data-testid="bond-noded"
             action={
               <Button
+                data-testid="un-bond"
                 disabled={isLoading}
                 onClick={async () => {
                   setIsLoading(true)
@@ -48,7 +50,7 @@ export const Unbond = () => {
           </Alert>
         )}
         {!ownership.hasOwnership && (
-          <Alert severity="info" style={{ margin: theme.spacing(3) }}>
+          <Alert severity="info" style={{ margin: theme.spacing(3) }} data-testid="no-bond">
             You don't currently have a bonded node
           </Alert>
         )}
diff --git a/tauri-wallet/src/routes/undelegate/UndelegateForm.tsx b/tauri-wallet/src/routes/undelegate/UndelegateForm.tsx
index cd41145aa6..4be7bacf45 100644
--- a/tauri-wallet/src/routes/undelegate/UndelegateForm.tsx
+++ b/tauri-wallet/src/routes/undelegate/UndelegateForm.tsx
@@ -84,7 +84,7 @@ export const UndelegateForm = ({
               />
             </Grid>
             <Grid item>
-              <Alert severity="info">
+              <Alert severity="info" data-testid="fee-amount">
                 {`A fee of ${
                   watchNodeType === EnumNodeType.mixnode
                     ? fees.mixnode.amount
@@ -140,6 +140,7 @@ export const UndelegateForm = ({
           variant="contained"
           color="primary"
           type="submit"
+          data-testid="submit-button"
           disableElevation
           disabled={isSubmitting}
           endIcon={isSubmitting && <CircularProgress size={20} />}
diff --git a/tauri-wallet/src/routes/undelegate/index.tsx b/tauri-wallet/src/routes/undelegate/index.tsx
index 456285d980..98b6319b08 100644
--- a/tauri-wallet/src/routes/undelegate/index.tsx
+++ b/tauri-wallet/src/routes/undelegate/index.tsx
@@ -102,14 +102,14 @@ export const Undelegate = () => {
               <RequestStatus
                 status={status}
                 Error={
-                  <Alert severity="error">
+                  <Alert severity="error" data-testid="request-error">
                     An error occurred with the request: {message}
                   </Alert>
                 }
                 Success={
                   <Alert severity="success">
                     {' '}
-                    <AlertTitle>Undelegation complete</AlertTitle>
+                    <AlertTitle data-testid="undelegate-success">Undelegation complete</AlertTitle>
                     {message}
                   </Alert>
                 }
@@ -125,6 +125,7 @@ export const Undelegate = () => {
                 }}
               >
                 <Button
+                  data-testid="finish-button"
                   onClick={() => {
                     setStatus(EnumRequestStatus.initial)
                     initialize()
diff --git a/tauri-wallet/src/types/rust/stateparams.ts b/tauri-wallet/src/types/rust/stateparams.ts
index b7dbabc531..4f6a8c6eea 100644
--- a/tauri-wallet/src/types/rust/stateparams.ts
+++ b/tauri-wallet/src/types/rust/stateparams.ts
@@ -3,9 +3,6 @@ export interface TauriStateParams {
   minimum_mixnode_bond: string;
   minimum_gateway_bond: string;
   mixnode_bond_reward_rate: string;
-  gateway_bond_reward_rate: string;
   mixnode_delegation_reward_rate: string;
-  gateway_delegation_reward_rate: string;
   mixnode_active_set_size: number;
-  gateway_active_set_size: number;
 }
\ No newline at end of file
diff --git a/tauri-wallet/webdriver/.gitignore b/tauri-wallet/webdriver/.gitignore
new file mode 100644
index 0000000000..34ad668654
--- /dev/null
+++ b/tauri-wallet/webdriver/.gitignore
@@ -0,0 +1,5 @@
+reports
+allure-results
+node_modules
+.vscode
+.idea
\ No newline at end of file
diff --git a/tauri-wallet/webdriver/README.md b/tauri-wallet/webdriver/README.md
new file mode 100644
index 0000000000..e527f85835
--- /dev/null
+++ b/tauri-wallet/webdriver/README.md
@@ -0,0 +1,79 @@
+<!--
+Copyright 2020 - Nym Technologies SA <contact@nymtech.net>
+SPDX-License-Identifier: Apache-2.0
+-->
+
+# Nym Wallet Webdriverio testsuite
+
+A webdriverio test suite implementation using tauri driver 
+with a page object model design. This is to provide quick iterative feedback
+on the UI of the nym wallet. Currently, tauri-driver is available to run on Windows and Linux machines.
+
+## Installation prerequisites 
+* `Yarn`
+* `NodeJS >= v16.8.0`
+* `Rust & cargo >= v1.51`
+* `tauri-driver`
+* `That you have an existing mnemonic and you can login to the app`
+* `Have the details listed below to provide the user-data.json file`
+
+
+## Key Information
+* Please read the instructions on the `nym/tauri-wallet/README.md` in the root of the project on how to build the application
+* Please ensure you have the relevant Webdriver kits installed on your machine -
+```
+linux:
+ sudo apt-get install -y webkit2gtk-driver 
+ ```
+ ```
+ windows: 
+download msedgedriver.exe from https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/
+```
+please visit [Tauri Studio](https://tauri.studio/en/docs/usage/guides/webdriver/introduction), this will specify the additional drivers you need
+* The path to run the application is set in the `wdio.conf.js` which lives in the root directory 
+* Before running the suite you need to build the application and check that the application has
+built successfully, if so, you will have an executable sitting in the target directory in `tauri-wallet/target/*/nym_wallet` (refer to point 1)
+* The suite will not be able to detect elements on screen if you select a release build, however you can run tests against a release target
+
+
+## Installation & usage
+*  `test excution happens inside /webdriver directory`
+*  `test data needs to be provided inside the user-data.json`
+*  `check the wdio.conf.cjs to see the test execution along with the path location of the binary`
+```
+example: 
+//mnemonic is a base64 enconded value, which is your 24 character passphrase, these values are for illustration purposes
+      {     
+      "mnemonic" : "dGhpcyBpcyBhIHBhc3NwaHJhc2UK",   
+      "punk_address" : "punk1f3dzkhmunma5ze5q952daxca6371989189",    
+      "receiver_address" : "punk1p0ce82jxxglpmutvhq4mdwgcwf4avm5n1821982",    
+      "amount_to_send" : "1",
+      "identity_key_to_delegate_mix_node": "value",
+      "identity_key_to_delegate_gateway" : "value",
+      "delegate_amount" : "1"
+      }
+```
+*  `yarn test:runall` - the first test run will take some time to spin up be patient
+*   You can run tests individually by passing through the script situated in the package.json for example `yarn test:newuser` 
+
+Tests are categorised and run by their pages, they follow a sequential flow, if one test case fails before the next execution it may derail the next test.
+
+//todo improve in near future
+
+## Test reporting
+Currently the tests use allure reporting, the configuration can be altered in the `wdio.conf.cjs`. At present it takes snapshots of any failing tests, the test output run can be seen in the allure-results directory
+Tests ouput:
+* <guid-testuite.xml> 
+* <guid-attachment.png>
+
+If any tests fail in their test run it will produce the stack trace error along with the test in question
+
+## TODO
+
+*Disclaimer*: Still WIP
+
+
+Implement error handling/ beforeTest() - validating json file exists with data for test execution
+
+
+Currently this is dev'd against a Linux based OS, not tested against windows yet.
diff --git a/tauri-wallet/webdriver/babel.config.js b/tauri-wallet/webdriver/babel.config.js
new file mode 100644
index 0000000000..8073490996
--- /dev/null
+++ b/tauri-wallet/webdriver/babel.config.js
@@ -0,0 +1,12 @@
+module.exports = {
+    "presets": [
+        [
+            "@babel/preset-env",
+            {
+                "targets": {
+                    "node": "14"
+                }
+            }
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/tauri-wallet/webdriver/common/constants/text-constants.js b/tauri-wallet/webdriver/common/constants/text-constants.js
new file mode 100644
index 0000000000..09e19ba685
--- /dev/null
+++ b/tauri-wallet/webdriver/common/constants/text-constants.js
@@ -0,0 +1,28 @@
+module.exports = {
+    //receivePage
+    "recievePageInformation" : "You can receive tokens by providing this address to the sender",
+    "receivePageHeaderText": "Receive Nym",
+    
+    //sendPage 
+    "sendPunk" : "Send PUNK",
+
+    //homePage
+    "homePageErrorMnemonic": "Error parsing bip39 mnemonic",
+    "homePageSignIn" : "Sign in",
+    "createOne" : "Create one",
+    "walletSuccess" : "Please store your mnemonic in a safe place. You'll need it to access your wallet",
+    
+    //bondPage // unbondPage
+    "bondAlreadyNoded" : "Looks like you already have a mixnode bonded.",
+    "bondNodeHeaderText": "Bond a node or gateway",
+    "unbondNodeHeaderText" : "Unbond a mixnode or gateway",
+    "unbondMixNodeText": "Looks like you already have a mixnode bonded.",
+    "unbondMixNode": "UNBOND",
+
+    //delegatePage // undelegatePage
+    "delegateHeaderText" : "Delegate\nDelegate to mixnode or gateway",
+    "nodeIdentityValidationText" : "identity is a required field",
+    "amountValidationText": "amount is a required field",
+    "undelegateHeaderText" : "Undelegate from a mixnode or gateway",
+    "delegationComplete" : "Delegation complete"
+}
\ No newline at end of file
diff --git a/tauri-wallet/webdriver/common/data/user-data.json b/tauri-wallet/webdriver/common/data/user-data.json
new file mode 100644
index 0000000000..92096f442b
--- /dev/null
+++ b/tauri-wallet/webdriver/common/data/user-data.json
@@ -0,0 +1,9 @@
+{
+    "mnemonic": "value",
+    "punk_address": "",
+    "receiver_address": "",
+    "amount_to_send": "",
+    "identity_key_to_delegate_mix_node": "",
+    "identity_key_to_delegate_gateway" : "",
+    "delegate_amount": ""
+}
\ No newline at end of file
diff --git a/tauri-wallet/webdriver/common/helpers/helper.js b/tauri-wallet/webdriver/common/helpers/helper.js
new file mode 100644
index 0000000000..0781de5ece
--- /dev/null
+++ b/tauri-wallet/webdriver/common/helpers/helper.js
@@ -0,0 +1,45 @@
+class Helpers {
+
+    //helper to decode mnemonic so plain 24 character passphrase isn't in sight albeit it is presented when ruunning the scripts
+    //maybe a show passphrase toggle button?
+    decodeBase = async (input) => {
+        var m = Buffer.from(input, 'base64').toString()
+        return m
+    }
+
+    navigateAndClick = async (element) => {
+        await element.click()
+    }
+
+    scrollIntoView = async (element) => {
+        await element.scrollIntoView()
+    }
+
+
+    currentBalance = async (value) => {
+        return parseFloat(value.split(/\s+/)[0].toString()).toFixed(5)
+    }
+
+    //todo need to improve calculation - WIP
+    calculateFees = async (beforeBalance, transactionFee, amount, isSend) => {
+        let fee
+
+        if (isSend) {
+            //send transaction 
+            fee = transactionFee.split(/\s+/)[0]
+        } else {
+            //delegate transaction
+            fee = transactionFee.split(/\s+/)[3]
+        }
+
+        const currentBalance = beforeBalance.split(/\s+/)[0]
+
+        const castCurrentBalance = parseFloat(currentBalance).toFixed(5)
+        const transCost = +parseFloat(amount) + +parseFloat(fee).toFixed(5)
+
+        let sum = parseFloat(castCurrentBalance) - parseFloat(transCost)
+        return sum.toFixed(5)
+    }
+}
+
+module.exports = new Helpers()
\ No newline at end of file
diff --git a/tauri-wallet/webdriver/package.json b/tauri-wallet/webdriver/package.json
new file mode 100644
index 0000000000..1adaaab495
--- /dev/null
+++ b/tauri-wallet/webdriver/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "tauri_nym_wallet",
+  "version": "1.0.0",
+  "private": false,
+  "license": "MIT",
+  "scripts": {
+    "test:runall": "wdio run wdio.conf.cjs",
+    "test:sendreceive": "wdio run wdio.conf.cjs --suite sendreceive",
+    "test:home": "wdio run wdio.conf.cjs --suite home",
+    "test:bond": "wdio run wdio.conf.cjs --suite bond",
+    "test:delegate": "wdio run wdio.conf.cjs --suite delegate",
+    "test:newuser": "wdio run wdio.conf.cjs --suite newuser"
+  },
+  "dependencies": {
+    "@types/node": "^16.11.0",
+    "@wdio/allure-reporter": "^7.16.1",
+    "@wdio/cli": "^7.9.1",
+    "@zxing/browser": "^0.0.9"
+  },
+  "devDependencies": {
+    "@wdio/local-runner": "^7.14.1",
+    "@wdio/mocha-framework": "^7.14.1",
+    "@wdio/spec-reporter": "^7.14.1"
+  }
+}
diff --git a/tauri-wallet/webdriver/tests/pages/wallet.bond.js b/tauri-wallet/webdriver/tests/pages/wallet.bond.js
new file mode 100644
index 0000000000..10e437caba
--- /dev/null
+++ b/tauri-wallet/webdriver/tests/pages/wallet.bond.js
@@ -0,0 +1,20 @@
+class WalletBond {
+
+  get header() { return $("#root > div > div:nth-child(2) > div:nth-child(2) > div > div > div > div.MuiCardHeader-root > div > span.MuiTypography-root.MuiCardHeader-subheader.MuiTypography-subtitle1.MuiTypography-colorTextSecondary.MuiTypography-displayBlock") }
+  get identityKey() { return $("#identityKey") }
+  get sphinxKey() { return $("#sphinxKey") }
+  get amountToBond() { return $("#amount") }
+  get hostInput() { return $("#host") }
+  get versionInput() { return $("version") }
+  get selectAdvancedOptions() { return $("[type='checkbox']") }
+  get mixPort() { return $("#mixPort") }
+  get verlocPort() { return $("#verlocPort") }
+  get httpApiPort() { return $("#httpApiPort") }
+  get bondButton() { return $("[data-testid='bond-button']") }
+  get unBondButton() { return $("[data-testid='un-bond']") }
+  get unBond() { return $("[data-testid='bond-noded']") }
+  get unBondWarning() {return $("div.MuiAlert-message")}
+
+}
+
+module.exports = new WalletBond()
\ No newline at end of file
diff --git a/tauri-wallet/webdriver/tests/pages/wallet.create.js b/tauri-wallet/webdriver/tests/pages/wallet.create.js
new file mode 100644
index 0000000000..13f5dd6bd8
--- /dev/null
+++ b/tauri-wallet/webdriver/tests/pages/wallet.create.js
@@ -0,0 +1,12 @@
+class WalletCreate {
+
+    get createAccount() { return $("[href='#']") }
+    get create() { return $("[data-testid='create-button']") }
+    get accountCreatedSuccessfully() { return $("[data-testid='mnemonic-warning']") }
+    get walletMnemonicValue() { return $("[data-testid='mnemonic-phrase']") }
+    get punkAddress() { return $("[data-testid='wallet-address']") }
+    get backToSignIn() { return $("[data-testid='sign-in-button']") }
+    get signInButton() { return $("[type='submit']") }
+
+}
+module.exports = new WalletCreate()
\ No newline at end of file
diff --git a/tauri-wallet/webdriver/tests/pages/wallet.delegate.js b/tauri-wallet/webdriver/tests/pages/wallet.delegate.js
new file mode 100644
index 0000000000..b19196b6a6
--- /dev/null
+++ b/tauri-wallet/webdriver/tests/pages/wallet.delegate.js
@@ -0,0 +1,26 @@
+class WalletDelegate {
+
+  get header() { return $("[data-testid='Delegate']") }
+  get nodeIdentity() { return $("#identity") }
+  get amountToDelegate() { return $("#amount") }
+  get identityValidation() { return $("#identity-helper-text") }
+  get amountToDelegateValidation() { return $("#amount-helper-text") }
+  get delegateStakeButton() { return $("[data-testid='delegate-button']") }
+  get mixNodeRadioButton() { return $("[data-testid='mix-node']") }
+  get gateWayRadioButton() { return $("[data-testid='gate-way']") }
+  get successfullyDelegate() { return $("[data-testid='delegate-success']") }
+  get finishButton() { return $("[data-testid='finish-button']") }
+  get transactionFeeAmount() { return $("[data-testid='fee-amount']") }
+  get accountBalance() { return $("[data-testid='account-balance']") }
+
+  //Undelegate
+  get unDelegateHeader() { return $("[data-testid='Undelegate']") }
+  get unNodeIdentity() { return $("[name='identity']") }
+  get unDelegateFeeText() { return $("[data-testid='fee-amount']") }
+  get unDelegateGatewayRadioButton() { return $("[data-testid='gate-way']") }
+  get unMixNodeRadioButton() { return $("[data-testid='mix-node']") }
+  get unDelegateButton() { return $("[data-testid='submit-button']") }
+
+}
+
+module.exports = new WalletDelegate()
\ No newline at end of file
diff --git a/tauri-wallet/webdriver/tests/pages/wallet.homepage.js b/tauri-wallet/webdriver/tests/pages/wallet.homepage.js
new file mode 100644
index 0000000000..c4681daf3a
--- /dev/null
+++ b/tauri-wallet/webdriver/tests/pages/wallet.homepage.js
@@ -0,0 +1,18 @@
+class WalletHome {
+
+    get balanceCheck() { return $("#root > div > div:nth-child(2) > div:nth-child(2) > div > div > div > div.MuiCardHeader-root > div > span") }
+    get punkBalance() { return $("") }
+    get punkAddress() { return $("[data-testid='wallet-address']") }
+    get accountBalance() { return $("[data-testid='account-balance']") }
+    get balanceButton() { return $("[href='/balance']") }
+    get sendButton() { return $("[href='/send']"); }
+    get receiveButton() { return $("[href='/receive']") }
+    get bondButton() { return $("[href='/bond']") }
+    get unBondButton() { return $("[href='/unbond']") }
+    get delegateButton() { return $("[href='/delegate']") }
+    get unDelegateButton() { return $("[href='/undelegate']") }
+    get logOutButton() { return $("[data-testid='log-out']") }
+
+}
+
+module.exports = new WalletHome()
\ No newline at end of file
diff --git a/tauri-wallet/webdriver/tests/pages/wallet.login.js b/tauri-wallet/webdriver/tests/pages/wallet.login.js
new file mode 100644
index 0000000000..f67d003bd9
--- /dev/null
+++ b/tauri-wallet/webdriver/tests/pages/wallet.login.js
@@ -0,0 +1,18 @@
+class WalletLogin {
+
+    get signInLabel() {return $("[data-testid='sign-in']")}
+    get mnemonic() { return $("#mnemonic")}
+    get signInButton() {return $("[type='submit']") }
+    get errorValidation() {return $("[class='MuiAlert-message']") }
+    get accountBalance() {return $("[data-test-id='account-balance']")}
+    get accountBalanceText() {return $("[class='MuiAlert-message']")}
+    get walletAddress() {return $("[data-testid='wallet-address']")}
+
+    //login to the application
+    enterMnemonic = async(mnemonic) => {
+        await this.mnemonic.addValue(mnemonic);
+        await this.signInButton.click();
+        await this.accountBalance.isExisting();
+    }
+}
+module.exports = new WalletLogin()
\ No newline at end of file
diff --git a/tauri-wallet/webdriver/tests/pages/wallet.receive.js b/tauri-wallet/webdriver/tests/pages/wallet.receive.js
new file mode 100644
index 0000000000..bf736df46d
--- /dev/null
+++ b/tauri-wallet/webdriver/tests/pages/wallet.receive.js
@@ -0,0 +1,24 @@
+class WalletReceive {
+
+    get receiveNymHeader() { return $("#root > div > div:nth-child(2) > div:nth-child(2) > div > div > div > div.MuiCardHeader-root > div > span") }
+    get receiveNymText() { return $("[data-testid='receive-nym']") }
+    get walletAddress() { return $("[data-testid='client-address']"); }
+    get copyButton() { return $("[data-testid='copy-button']") }
+    get qrCode() { return $("[data-testid='qr-code']") }
+
+    WaitForButtonChangeOnCopy = async () => {
+        await this.copyButton.click()
+
+        await this.copyButton.waitForDisplayed({ timeout: 1500 })
+
+        await this.copyButton.waitUntil(async function () {
+            return (await this.getText()) === 'COPIED'
+        }, {
+            timeout: 1500,
+            timeoutMsg: 'expected text to be different after 1.5s'
+        })
+    }
+
+}
+
+module.exports = new WalletReceive()
\ No newline at end of file
diff --git a/tauri-wallet/webdriver/tests/pages/wallet.send.js b/tauri-wallet/webdriver/tests/pages/wallet.send.js
new file mode 100644
index 0000000000..8c11550a6a
--- /dev/null
+++ b/tauri-wallet/webdriver/tests/pages/wallet.send.js
@@ -0,0 +1,22 @@
+class WalletSend {
+    
+    get fromAddress() { return $("#from") }
+    get toAddress() { return $("#to") }
+    get amount() { return $("#amount") }
+    get nextButton() { return $("[data-testid='button") }
+    get sendHeader() { return $("[data-testid='Send PUNK']") }
+    get accountBalance() { return $("[data-testid='account-balance']") }
+    get amountReviewAndSend() { return $("[data-testid='Amount']") }
+    get toAddressReviewAndSend() { return $("[data-testid='To']") }
+    get fromAddressReviewAndSend() { return $("[data-testid='From']") }
+    get transferFeeAmount() { return $("[data-testid='Transfer fee']") }
+    get reviewAndSendBackButton() { return $("[data-testid='back-button']") }
+    get sendButton() { return $("[data-testid='button']") }
+    get transactionComplete() { return $("[data-testid='transaction-complete']") }
+    get transactionCompleteRecipient() { return $("[data-testid='to-address']") }
+    get transactionCompleteAmount() { return $("[data-testid='send-amount']") }
+    get finishButton() { return $("[data-testid='button']") }
+
+}
+
+module.exports = new WalletSend()
\ No newline at end of file
diff --git a/tauri-wallet/webdriver/tests/pages/wallet.undelegate.js b/tauri-wallet/webdriver/tests/pages/wallet.undelegate.js
new file mode 100644
index 0000000000..9e1c82f99f
--- /dev/null
+++ b/tauri-wallet/webdriver/tests/pages/wallet.undelegate.js
@@ -0,0 +1,12 @@
+class WallentUndelegate {
+
+  get transactionFee() { return $("[data-testid='fee-amount']") }
+  get mixNodeRadioButton() { return $("[value='mixnode']") }
+  get gatewayRadionButton() { return $("[value='gateway']") }
+  get nodeIdentity() { return $("#mui-55011") }
+  get identityHelper() { return $("#identity-helper-text") }
+  get delegateButton() { return $("[data-testid='submit-button']") }
+
+}
+
+module.exports = new WallentUndelegate()
\ No newline at end of file
diff --git a/tauri-wallet/webdriver/tests/specs/existinguser/test.wallet.bond.js b/tauri-wallet/webdriver/tests/specs/existinguser/test.wallet.bond.js
new file mode 100644
index 0000000000..76e2d1b64c
--- /dev/null
+++ b/tauri-wallet/webdriver/tests/specs/existinguser/test.wallet.bond.js
@@ -0,0 +1,55 @@
+const userData = require('../../../common/data/user-data.json')
+const helper = require('../../../common/helpers/helper')
+const walletLogin = require('../../pages/wallet.login')
+const textConstants = require('../../../common/constants/text-constants')
+const walletHomepage = require('../../pages/wallet.homepage')
+const bondPage = require('../../pages/wallet.bond')
+
+describe("bonding and unbonding nodes", () => {
+    it("should have a node already bonded and validate no input fields are enabled", async () => {
+
+        const mnemonic = await helper.decodeBase(userData.mnemonic);
+
+        await walletLogin.enterMnemonic(mnemonic);
+
+        await helper.navigateAndClick(walletHomepage.bondButton);
+
+        await helper.scrollIntoView(bondPage.selectAdvancedOptions);
+
+        await bondPage.selectAdvancedOptions.click();
+
+        //as bond node is mixed expect all the fields to be disabled
+        const getText = await bondPage.header.getText()
+        const getIdentity = await bondPage.identityKey.isEnabled()
+        const getSphinxKey = await bondPage.sphinxKey.isEnabled()
+        const amountToBond = await bondPage.amountToBond.isEnabled()
+        const hostInput = await bondPage.hostInput.isEnabled()
+        const verlocPort = await bondPage.verlocPort.isEnabled()
+        const httpApiPort = await bondPage.httpApiPort.isEnabled()
+        const mixPort = await bondPage.mixPort.isEnabled()
+
+        //assert all field are not functional
+        expect(getText).toEqual(textConstants.bondNodeHeaderText)
+        expect(getIdentity).toEqual(false)
+        expect(getSphinxKey).toEqual(false)
+        expect(amountToBond).toEqual(false)
+        expect(hostInput).toEqual(false)
+        expect(verlocPort).toEqual(false)
+        expect(httpApiPort).toEqual(false)
+        expect(mixPort).toEqual(false)
+    })
+
+    it("unbond mix monde screen should be present with the option to unbond", async () => {
+        //we do not want to unbond our node, check that elements are selectable
+        await helper.scrollIntoView(walletHomepage.unBondButton)
+        await helper.navigateAndClick(walletHomepage.unBondButton)
+
+        const getText = await bondPage.header.getText()
+        const unbondText = await bondPage.unBondWarning.getText()
+
+        await bondPage.unBondButton.isClickable()
+        //assert all field are not functional
+        expect(getText).toEqual(textConstants.unbondNodeHeaderText)
+        expect(unbondText).toEqual(textConstants.unbondMixNodeText)
+     })
+})
diff --git a/tauri-wallet/webdriver/tests/specs/existinguser/test.wallet.delegate.js b/tauri-wallet/webdriver/tests/specs/existinguser/test.wallet.delegate.js
new file mode 100644
index 0000000000..d287fe06c4
--- /dev/null
+++ b/tauri-wallet/webdriver/tests/specs/existinguser/test.wallet.delegate.js
@@ -0,0 +1,90 @@
+const userData = require('../../../common/data/user-data.json')
+const helper = require('../../../common/helpers/helper')
+const walletLogin = require('../../pages/wallet.login')
+const textConstants = require('../../../common/constants/text-constants')
+const walletHomepage = require('../../pages/wallet.homepage')
+const delegatePage = require('../../pages/wallet.delegate')
+
+describe("delegate to a mix node or gateway", () => {
+    it("ensure that fields are enabled for existing user", async () => {
+
+        const mnemonic = await helper.decodeBase(userData.mnemonic)
+
+        await walletLogin.enterMnemonic(mnemonic)
+
+        await helper.navigateAndClick(walletHomepage.delegateButton)
+
+        const getText = await delegatePage.header.getText()
+
+        expect(getText).toEqual(textConstants.delegateHeaderText)
+    })
+
+    it("submitting the form without input prompts validation errors", async () => {
+
+        await delegatePage.delegateStakeButton.click()
+
+        const getIdentityValidation = await delegatePage.identityValidation.getText()
+        const getAmountValidation = await delegatePage.amountToDelegateValidation.getText()
+
+        expect(getIdentityValidation).toEqual(textConstants.nodeIdentityValidationText)
+        expect(getAmountValidation).toEqual(textConstants.amountValidationText)
+
+    })
+
+    it("input delegate amount to a mix node then broadcast the transaction then check account balances", async () => {
+        
+        const balanceText = await delegatePage.accountBalance.getText()
+
+        const getTransfeeAmount = await delegatePage.transactionFeeAmount.getText()
+
+        await delegatePage.nodeIdentity.setValue(userData.identity_key_to_delegate_mix_node)
+
+        await delegatePage.amountToDelegate.setValue(userData.delegate_amount)
+
+        //transfer fee + amount delegation
+        const sumCost = await helper.calculateFees(balanceText, getTransfeeAmount, userData.delegate_amount, false)
+
+        await delegatePage.delegateStakeButton.click()
+
+        await delegatePage.successfullyDelegate.waitForClickable({ timeout: 10000 })
+
+        const getConfirmationText = await delegatePage.successfullyDelegate.getText()
+        expect(getConfirmationText).toContain(textConstants.delegationComplete)
+
+        const availablePunk = await delegatePage.accountBalance.getText()
+        //expect new account balance - the fee calculation above
+
+        await delegatePage.finishButton.click()
+
+        expect(await helper.currentBalance(availablePunk)).toEqual(sumCost)
+  
+    })
+
+    it("input amount to stake to a gateway then broadcast the transaction then check account balances", async () => {
+        const balanceText = await delegatePage.accountBalance.getText()
+
+        const getTransfeeAmount = await delegatePage.transactionFeeAmount.getText()
+
+        await delegatePage.gateWayRadioButton.click()
+
+        await delegatePage.nodeIdentity.setValue(userData.identity_key_to_delegate_gateway)
+
+        await delegatePage.amountToDelegate.setValue(userData.delegate_amount)
+
+        //transfer fee + amount delegation
+
+        const sumCost = await helper.calculateFees(balanceText, getTransfeeAmount, userData.delegate_amount, false)
+
+        await delegatePage.delegateStakeButton.click()
+        
+        await delegatePage.successfullyDelegate.waitForClickable({ timeout: 10000 })
+
+        const getConfirmationText = await delegatePage.successfullyDelegate.getText()
+        expect(getConfirmationText).toContain(textConstants.delegationComplete)
+
+        const availablePunk = await delegatePage.accountBalance.getText()
+        //expect new account balance - the fee calculation above
+        expect(await helper.currentBalance(availablePunk)).toEqual(sumCost)
+
+    })
+})
diff --git a/tauri-wallet/webdriver/tests/specs/existinguser/test.wallet.home.js b/tauri-wallet/webdriver/tests/specs/existinguser/test.wallet.home.js
new file mode 100644
index 0000000000..43b4cd2da1
--- /dev/null
+++ b/tauri-wallet/webdriver/tests/specs/existinguser/test.wallet.home.js
@@ -0,0 +1,51 @@
+const userData = require('../../../common/data/user-data.json')
+const helper = require('../../../common/helpers/helper')
+const walletLogin = require('../../pages/wallet.login')
+const homepPage = require('../../pages/wallet.homepage')
+const textConstants = require('../../../common/constants/text-constants')
+
+describe("wallet splash screen", () => {
+  it("should have the sign in header present", async () => {
+
+    const signInText = await walletLogin.signInLabel.getText()
+    expect(signInText).toEqual(textConstants.homePageSignIn)
+ 
+  })
+
+  it("submitting the sign in button with no input throws a validation error", async () => {
+
+    await walletLogin.signInButton.click()
+
+    const errorResponseText = await walletLogin.errorValidation.getText()
+    expect(errorResponseText).toEqual(textConstants.homePageErrorMnemonic)
+  })
+
+  //currently the punk_address is not fully displayed on the wallet UI
+  //trim the punk address
+  it("successfully input mnemonic and log in", async () => {
+    const mnemonic = await helper.decodeBase(userData.mnemonic)
+
+    await walletLogin.enterMnemonic(mnemonic)
+
+    await walletLogin.walletAddress.waitForEnabled({ timeout: 5000 })
+
+    const getWalletAddress = await walletLogin.walletAddress.getText()
+    //currently 35 characters are displayed along with three ...
+    //current hack we can assume this is the correct wallet
+    const walletTruncated = userData.punk_address.substring(0,35)
+
+    expect(walletTruncated + '...').toContain(getWalletAddress)
+
+  })
+
+  it("successfully log out the application", async () => {
+
+    await helper.scrollIntoView(homepPage.logOutButton)
+
+    await homepPage.logOutButton.click()
+
+    await walletLogin.signInLabel.waitForEnabled({ timeout: 1500 })
+    expect(await walletLogin.signInLabel.isDisplayed()).toEqual(true)
+
+  })
+})
\ No newline at end of file
diff --git a/tauri-wallet/webdriver/tests/specs/existinguser/test.wallet.receive.js b/tauri-wallet/webdriver/tests/specs/existinguser/test.wallet.receive.js
new file mode 100644
index 0000000000..791cda2127
--- /dev/null
+++ b/tauri-wallet/webdriver/tests/specs/existinguser/test.wallet.receive.js
@@ -0,0 +1,29 @@
+const userData = require('../../../common/data/user-data.json')
+const textConstants = require('../../../common/constants/text-constants')
+const helper = require('../../../common/helpers/helper')
+const walletLogin = require('../../pages/wallet.login')
+const receive = require('../../pages/wallet.receive')
+const walletHomepage = require('../../pages/wallet.homepage')
+
+describe("provide the relevant information about a user nym wallet address", () => {
+    it("should have the receivers address and a qr code present", async () => {
+
+        const mnemonic = await helper.decodeBase(userData.mnemonic)
+
+        await walletLogin.enterMnemonic(mnemonic)
+
+        await helper.navigateAndClick(walletHomepage.receiveButton)
+
+        await receive.receiveNymHeader.waitForDisplayed({ timeout: 1500 })
+
+        await receive.WaitForButtonChangeOnCopy()
+
+        const textHeader = await receive.receiveNymHeader.getText();
+        const getInformationText = await receive.receiveNymText.getText()
+        const getPunkAddress = await receive.walletAddress.getText()
+
+        expect(getPunkAddress).toEqual(userData.punk_address)
+        expect(getInformationText).toEqual(textConstants.recievePageInformation)
+        expect(textConstants.receivePageHeaderText).toEqual(textHeader)
+    })
+})
diff --git a/tauri-wallet/webdriver/tests/specs/existinguser/test.wallet.send.js b/tauri-wallet/webdriver/tests/specs/existinguser/test.wallet.send.js
new file mode 100644
index 0000000000..a230d89421
--- /dev/null
+++ b/tauri-wallet/webdriver/tests/specs/existinguser/test.wallet.send.js
@@ -0,0 +1,55 @@
+const userData = require('../../../common/data/user-data.json');
+const helper = require('../../../common/helpers/helper')
+const textConstants = require('../../../common/constants/text-constants')
+const walletLogin = require('../../pages/wallet.login')
+const sendWallet = require('../../pages/wallet.send')
+const walletHomepage = require('../../pages/wallet.homepage')
+
+describe("send punk to another a wallet", () => {
+    it("expect send screen to display the data", async () => {
+
+        const mnemonic = await helper.decodeBase(userData.mnemonic)
+
+        await walletLogin.enterMnemonic(mnemonic)
+
+        await helper.navigateAndClick(walletHomepage.sendButton)
+
+        const textHeader = await sendWallet.sendHeader.getText()
+
+        expect(textHeader).toContain(textConstants.sendPunk)
+
+    })
+
+    it("send funds correctly to another punk address", async () => {
+
+        //already logged in due to the previous test
+        const getCurrentBalance = await walletHomepage.accountBalance.getText()
+
+        await sendWallet.toAddress.addValue(userData.receiver_address)
+
+        await sendWallet.amount.addValue(userData.amount_to_send)
+
+        await sendWallet.nextButton.waitForEnabled({ timeout: 3000 })
+
+        await sendWallet.nextButton.click()
+
+        const transFee = await sendWallet.transferFeeAmount.getText()
+
+        await sendWallet.sendButton.click()
+
+        await sendWallet.finishButton.waitForClickable({ timeout: 10000 })
+
+        let sumCost = await helper.calculateFees(getCurrentBalance, transFee, userData.amount_to_send, true)
+       
+        await walletHomepage.accountBalance.isDisplayed()
+
+        const availablePunk = await walletHomepage.accountBalance.getText()
+
+        await sendWallet.finishButton.click()
+
+        //expect new account balance - the fee calculation above
+        expect(await helper.currentBalance(availablePunk)).toEqual(sumCost)
+
+    })
+})
+
diff --git a/tauri-wallet/webdriver/tests/specs/existinguser/test.wallet.undelegate.js b/tauri-wallet/webdriver/tests/specs/existinguser/test.wallet.undelegate.js
new file mode 100644
index 0000000000..c0beeb40e6
--- /dev/null
+++ b/tauri-wallet/webdriver/tests/specs/existinguser/test.wallet.undelegate.js
@@ -0,0 +1,32 @@
+const userData = require('../../../common/data/user-data.json')
+const helper = require('../../../common/helpers/helper')
+const walletLogin = require('../../pages/wallet.login')
+const walletHomepage = require('../../pages/wallet.homepage')
+const unDelegatePage = require('../../pages/wallet.delegate')
+
+describe("un-delegate a mix node or gateway", () => {
+    it("ensure that fields are enabled for existing user", async () => {
+        
+        //we are ensuring that the fields are selectable for undelegation 
+        //not proceeding to undelegate a node or gateway
+
+        const mnemonic = await helper.decodeBase(userData.mnemonic)
+
+        await walletLogin.enterMnemonic(mnemonic)
+
+        await helper.scrollIntoView(walletHomepage.unDelegateButton)
+
+        await helper.navigateAndClick(walletHomepage.unDelegateButton)
+
+        await unDelegatePage.unDelegateButton.waitForClickable({ timeout: 1500})
+
+        await unDelegatePage.unDelegateButton.isEnabled()
+       
+        await unDelegatePage.unDelegateGatewayRadioButton.click()
+
+        await unDelegatePage.unDelegateGatewayRadioButton.isSelected()
+        
+        const mixNodeRadioButton = await unDelegatePage.unMixNodeRadioButton.isSelected()
+        expect(mixNodeRadioButton).toEqual(false)
+    })
+})
diff --git a/tauri-wallet/webdriver/tests/specs/newuser/test.wallet.create.js b/tauri-wallet/webdriver/tests/specs/newuser/test.wallet.create.js
new file mode 100644
index 0000000000..989edc5a01
--- /dev/null
+++ b/tauri-wallet/webdriver/tests/specs/newuser/test.wallet.create.js
@@ -0,0 +1,38 @@
+const walletLogin = require('../../pages/wallet.login')
+const walletSignUp = require('../../pages/wallet.create')
+const textConstants = require('../../../common/constants/text-constants')
+
+describe("non existing wallet holder", () => {
+    //wallet mnemonic gets pushed here
+    const DATA = []
+    it("create a new account and wallet", async () => {
+
+        const signInText = await walletLogin.signInLabel.getText();
+        expect(signInText).toEqual(textConstants.homePageSignIn);
+
+        await walletSignUp.createAccount.click();
+
+        //wallet generation takes some time - apply wait
+        await walletSignUp.create.click()
+
+        await walletSignUp.accountCreatedSuccessfully.waitForEnabled({ timeout: 10000 })
+
+        const getWalletText = await walletSignUp.punkAddress.getText()
+        expect(getWalletText.length).toEqual(43)
+
+        const accountCreated = await walletSignUp.accountCreatedSuccessfully.getText()
+        expect(accountCreated).toEqual(textConstants.walletSuccess)
+
+        const getMnemonic = await walletSignUp.walletMnemonicValue.getText()
+        DATA.push(getMnemonic)
+    })
+
+    it("navigate back to sign in screen and validate mnemonic works", async () => {
+
+        await walletSignUp.backToSignIn.click()
+
+        await walletLogin.enterMnemonic(DATA[0])
+        
+        await walletLogin.walletAddress.isDisplayed()
+    })
+})
\ No newline at end of file
diff --git a/tauri-wallet/webdriver/wdio.conf.cjs b/tauri-wallet/webdriver/wdio.conf.cjs
new file mode 100644
index 0000000000..f517547365
--- /dev/null
+++ b/tauri-wallet/webdriver/wdio.conf.cjs
@@ -0,0 +1,80 @@
+const os = require("os");
+const path = require("path");
+const { spawn, spawnSync } = require("child_process");
+//insert path to binary
+const nym_path = "../target/release/nym_wallet";
+
+exports.config = {
+  //run sequentially, as using one default user may cause issues for parallel test runs for now
+  specs: [
+    "./tests/specs/existinguser/test.wallet.home.js",
+    "./tests/specs/existinguser/test.wallet.send.js",
+    "./tests/specs/existinguser/test.wallet.receive.js",
+    "./tests/specs/existinguser/test.wallet.bond.js",
+    "./tests/specs/existinguser/test.wallet.delegate.js",
+    "./tests/specs/newuser/test.wallet.create.js"
+  ],
+
+  //run tests by providing --suite {{login}} 
+  suites: {
+    home: ["./tests/specs/existinguser/test.wallet.home.js"],
+    sendreceive: ["./tests/specs/existinguser/test.wallet.send.js",
+      "./tests/specs/existinguser/test.wallet.receive.js"],
+    bond: ["./tests/specs/existinguser/test.wallet.bond.js"],
+    delegate: ["./tests/specs/existinguser/test.wallet.delegate.js",
+      "./tests/specs/existinguser/test.wallet.undelegate.js"],
+    newuser: ["./tests/specs/newuser/test.wallet.create.js"]
+  },
+  maxInstances: 1,
+  capabilities: [
+    {
+      maxInstances: 1,
+      "tauri:options": {
+        application: nym_path,
+      },
+    },
+  ],
+  // ===================
+  // Test Configurations
+  // ===================
+  // Define all options that are relevant for the WebdriverIO instance here
+  // Level of logging verbosity: trace | debug | info | warn | error | silent
+  bail: 0,
+  framework: 'mocha',
+  reporters: ['spec'],
+  mochaOpts: {
+    ui: 'bdd',
+    timeout: 60000
+  },
+  logLevel: 'silent',
+
+  // ===================
+  // Test Reporters
+  // ===================
+  reporters: [['allure', {
+    outputDir: 'allure-results',
+    disableWebdriverStepsReporting: true,
+    disableWebdriverScreenshotsReporting: true,
+  }]],
+
+  // this is documentented in the readme - you will need to build the project first
+  // ensure the rust project is built since we expect this binary to exist for the webdriver sessions
+  //onPrepare: () => spawnSync("cargo", ["build", "--release"]),
+
+  // ensure we are running `tauri-driver` before the session starts so that we can proxy the webdriver requests
+  beforeSession: () =>
+  (tauriDriver = spawn(
+    path.resolve(os.homedir(), ".cargo", "bin", "tauri-driver"),
+    [],
+    { stdio: [null, process.stdout, process.stderr] }
+  )),
+
+  afterTest: function (test, context, { error, result, duration, passed, retries }) {
+    if (error) {
+      browser.takeScreenshot()
+    }
+  },
+
+  // clean up the `tauri-driver` process we spawned at the start of the session
+  afterSession: () => tauriDriver.kill()
+}
diff --git a/tauri-wallet/webdriver/yarn.lock b/tauri-wallet/webdriver/yarn.lock
new file mode 100644
index 0000000000..f62c2ada9e
--- /dev/null
+++ b/tauri-wallet/webdriver/yarn.lock
@@ -0,0 +1,2584 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@babel/code-frame@^7.12.13":
+  version "7.15.8"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.15.8.tgz#45990c47adadb00c03677baa89221f7cc23d2503"
+  integrity sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==
+  dependencies:
+    "@babel/highlight" "^7.14.5"
+
+"@babel/helper-validator-identifier@^7.14.5":
+  version "7.15.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
+  integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
+
+"@babel/highlight@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9"
+  integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.14.5"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@jest/types@^27.2.5":
+  version "27.2.5"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.2.5.tgz#420765c052605e75686982d24b061b4cbba22132"
+  integrity sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^16.0.0"
+    chalk "^4.0.0"
+
+"@sindresorhus/is@^4.0.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.2.0.tgz#667bfc6186ae7c9e0b45a08960c551437176e1ca"
+  integrity sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw==
+
+"@szmarczak/http-timer@^4.0.5":
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
+  integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==
+  dependencies:
+    defer-to-connect "^2.0.0"
+
+"@types/aria-query@^4.2.1":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.2.tgz#ed4e0ad92306a704f9fb132a0cfcf77486dbe2bc"
+  integrity sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==
+
+"@types/cacheable-request@^6.0.1":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.2.tgz#c324da0197de0a98a2312156536ae262429ff6b9"
+  integrity sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==
+  dependencies:
+    "@types/http-cache-semantics" "*"
+    "@types/keyv" "*"
+    "@types/node" "*"
+    "@types/responselike" "*"
+
+"@types/diff@^5.0.0":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@types/diff/-/diff-5.0.1.tgz#9c9b9a331d4e41ccccff553f5d7ef964c6cf4042"
+  integrity sha512-XIpxU6Qdvp1ZE6Kr3yrkv1qgUab0fyf4mHYvW8N3Bx3PCsbN6or1q9/q72cv5jIFWolaGH08U9XyYoLLIykyKQ==
+
+"@types/easy-table@^0.0.33":
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/@types/easy-table/-/easy-table-0.0.33.tgz#b1f7ec29014ec24906b4f28d8368e2e99b399313"
+  integrity sha512-/vvqcJPmZUfQwCgemL0/34G7bIQnCuvgls379ygRlcC1FqNqk3n+VZ15dAO51yl6JNDoWd8vsk+kT8zfZ1VZSw==
+
+"@types/ejs@^3.0.5":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@types/ejs/-/ejs-3.1.0.tgz#ab8109208106b5e764e5a6c92b2ba1c625b73020"
+  integrity sha512-DCg+Ka+uDQ31lJ/UtEXVlaeV3d6t81gifaVWKJy4MYVVgvJttyX/viREy+If7fz+tK/gVxTGMtyrFPnm4gjrVA==
+
+"@types/fs-extra@^9.0.4":
+  version "9.0.13"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45"
+  integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==
+  dependencies:
+    "@types/node" "*"
+
+"@types/http-cache-semantics@*":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
+  integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==
+
+"@types/inquirer@^8.1.2":
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-8.1.3.tgz#dfda4c97cdbe304e4dceb378a80f79448ea5c8fe"
+  integrity sha512-AayK4ZL5ssPzR1OtnOLGAwpT0Dda3Xi/h1G0l1oJDNrowp7T1423q4Zb8/emr7tzRlCy4ssEri0LWVexAqHyKQ==
+  dependencies:
+    "@types/through" "*"
+    rxjs "^7.2.0"
+
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
+  integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==
+
+"@types/istanbul-lib-report@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
+  integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
+  dependencies:
+    "@types/istanbul-lib-coverage" "*"
+
+"@types/istanbul-reports@^3.0.0":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff"
+  integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==
+  dependencies:
+    "@types/istanbul-lib-report" "*"
+
+"@types/keyv@*":
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.3.tgz#1c9aae32872ec1f20dcdaee89a9f3ba88f465e41"
+  integrity sha512-FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg==
+  dependencies:
+    "@types/node" "*"
+
+"@types/lodash.flattendeep@^4.4.6":
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/@types/lodash.flattendeep/-/lodash.flattendeep-4.4.6.tgz#2686d9161ae6c3d56d6745fa118308d88562ae53"
+  integrity sha512-uLm2MaRVlqJSGsMK0RZpP5T3KqReq+9WbYDHCUhBhp98v56hMG/Yht52bsoTSui9xz2mUvQ9NfG3LrNGDL92Ng==
+  dependencies:
+    "@types/lodash" "*"
+
+"@types/lodash.pickby@^4.6.6":
+  version "4.6.6"
+  resolved "https://registry.yarnpkg.com/@types/lodash.pickby/-/lodash.pickby-4.6.6.tgz#3dc39c2b38432f7a0c5e5627b0d5c0e3878b4f35"
+  integrity sha512-NFa13XxlMd9eFi0UFZFWIztpMpXhozbijrx3Yb1viYZphT7jyopIFVoIRF4eYMjruWNEG1rnyrRmg/8ej9T8Iw==
+  dependencies:
+    "@types/lodash" "*"
+
+"@types/lodash.union@^4.6.6":
+  version "4.6.6"
+  resolved "https://registry.yarnpkg.com/@types/lodash.union/-/lodash.union-4.6.6.tgz#2f77f2088326ed147819e9e384182b99aae8d4b0"
+  integrity sha512-Wu0ZEVNcyCz8eAn6TlUbYWZoGbH9E+iOHxAZbwUoCEXdUiy6qpcz5o44mMXViM4vlPLLCPlkAubEP1gokoSZaw==
+  dependencies:
+    "@types/lodash" "*"
+
+"@types/lodash@*":
+  version "4.14.176"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.176.tgz#641150fc1cda36fbfa329de603bbb175d7ee20c0"
+  integrity sha512-xZmuPTa3rlZoIbtDUyJKZQimJV3bxCmzMIO2c9Pz9afyDro6kr7R79GwcB6mRhuoPmV2p1Vb66WOJH7F886WKQ==
+
+"@types/mocha@^9.0.0":
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.0.0.tgz#3205bcd15ada9bc681ac20bef64e9e6df88fd297"
+  integrity sha512-scN0hAWyLVAvLR9AyW7HoFF5sJZglyBsbPuHO4fv7JRvfmPBMfp1ozWqOf/e4wwPNxezBZXRfWzMb6iFLgEVRA==
+
+"@types/node@*", "@types/node@^16.11.0", "@types/node@^16.11.1":
+  version "16.11.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.1.tgz#2e50a649a50fc403433a14f829eface1a3443e97"
+  integrity sha512-PYGcJHL9mwl1Ek3PLiYgyEKtwTMmkMw4vbiyz/ps3pfdRYLVv+SN7qHVAImrjdAXxgluDEw6Ph4lyv+m9UpRmA==
+
+"@types/object-inspect@^1.8.0":
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/@types/object-inspect/-/object-inspect-1.8.1.tgz#7c08197ad05cc0e513f529b1f3919cc99f720e1f"
+  integrity sha512-0JTdf3CGV0oWzE6Wa40Ayv2e2GhpP3pEJMcrlM74vBSJPuuNkVwfDnl0SZxyFCXETcB4oKA/MpTVfuYSMOelBg==
+
+"@types/recursive-readdir@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@types/recursive-readdir/-/recursive-readdir-2.2.0.tgz#b39cd5474fd58ea727fe434d5c68b7a20ba9121c"
+  integrity sha512-HGk753KRu2N4mWduovY4BLjYq4jTOL29gV2OfGdGxHcPSWGFkC5RRIdk+VTs5XmYd7MVAD+JwKrcb5+5Y7FOCg==
+  dependencies:
+    "@types/node" "*"
+
+"@types/responselike@*", "@types/responselike@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
+  integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==
+  dependencies:
+    "@types/node" "*"
+
+"@types/stack-utils@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
+  integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
+
+"@types/stream-buffers@^3.0.3":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/stream-buffers/-/stream-buffers-3.0.4.tgz#bf128182da7bc62722ca0ddf5458a9c65f76e648"
+  integrity sha512-qU/K1tb2yUdhXkLIATzsIPwbtX6BpZk0l3dPW6xqWyhfzzM1ECaQ/8faEnu3CNraLiQ9LHyQQPBGp7N9Fbs25w==
+  dependencies:
+    "@types/node" "*"
+
+"@types/supports-color@^8.1.0":
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/@types/supports-color/-/supports-color-8.1.1.tgz#1b44b1b096479273adf7f93c75fc4ecc40a61ee4"
+  integrity sha512-dPWnWsf+kzIG140B8z2w3fr5D03TLWbOAFQl45xUpI3vcizeXriNR5VYkWZ+WTMsUHqZ9Xlt3hrxGNANFyNQfw==
+
+"@types/through@*":
+  version "0.0.30"
+  resolved "https://registry.yarnpkg.com/@types/through/-/through-0.0.30.tgz#e0e42ce77e897bd6aead6f6ea62aeb135b8a3895"
+  integrity sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==
+  dependencies:
+    "@types/node" "*"
+
+"@types/tmp@^0.2.0":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.2.1.tgz#83ecf4ec22a8c218c71db25f316619fe5b986011"
+  integrity sha512-7cTXwKP/HLOPVgjg+YhBdQ7bMiobGMuoBmrGmqwIWJv8elC6t1DfVc/mn4fD9UE1IjhwmhaQ5pGVXkmXbH0rhg==
+
+"@types/which@^1.3.2":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@types/which/-/which-1.3.2.tgz#9c246fc0c93ded311c8512df2891fb41f6227fdf"
+  integrity sha512-8oDqyLC7eD4HM307boe2QWKyuzdzWBj56xI/imSl2cpL+U3tCMaTAkMJ4ee5JBZ/FsOJlvRGeIShiZDAl1qERA==
+
+"@types/yargs-parser@*":
+  version "20.2.1"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129"
+  integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==
+
+"@types/yargs@^16.0.0":
+  version "16.0.4"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977"
+  integrity sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==
+  dependencies:
+    "@types/yargs-parser" "*"
+
+"@types/yauzl@^2.9.1":
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz#c48e5d56aff1444409e39fa164b0b4d4552a7b7a"
+  integrity sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==
+  dependencies:
+    "@types/node" "*"
+
+"@ungap/promise-all-settled@1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
+  integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
+
+"@wdio/cli@^7.9.1":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@wdio/cli/-/cli-7.16.0.tgz#8246bc269d9a74e7f492524963c277df353d0e6b"
+  integrity sha512-B0O0hjGxzmCTiGNE7DL7PqZPtIkQjTxgh1ZP9BZir4gfJwZlYh3BaLXtqPhEm6gzEI8w2YUhHbXwPq+8iCVkrA==
+  dependencies:
+    "@types/ejs" "^3.0.5"
+    "@types/fs-extra" "^9.0.4"
+    "@types/inquirer" "^8.1.2"
+    "@types/lodash.flattendeep" "^4.4.6"
+    "@types/lodash.pickby" "^4.6.6"
+    "@types/lodash.union" "^4.6.6"
+    "@types/node" "^16.11.1"
+    "@types/recursive-readdir" "^2.2.0"
+    "@wdio/config" "7.16.0"
+    "@wdio/logger" "7.16.0"
+    "@wdio/types" "7.16.0"
+    "@wdio/utils" "7.16.0"
+    async-exit-hook "^2.0.1"
+    chalk "^4.0.0"
+    chokidar "^3.0.0"
+    cli-spinners "^2.1.0"
+    ejs "^3.0.1"
+    fs-extra "^10.0.0"
+    inquirer "8.1.5"
+    lodash.flattendeep "^4.4.0"
+    lodash.pickby "^4.6.0"
+    lodash.union "^4.6.0"
+    mkdirp "^1.0.4"
+    recursive-readdir "^2.2.2"
+    webdriverio "7.16.0"
+    yargs "^17.0.0"
+    yarn-install "^1.0.0"
+
+"@wdio/config@7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@wdio/config/-/config-7.16.0.tgz#1d68197f0059909187586a39efb98f6d11219055"
+  integrity sha512-BrHJvdiA1hPmVu69/X7TBz0kxDri584MW1meBHOyPcJAwcavdmK4AcaS1v5hcZ1zOZPl+cTuF5QN2q3Y56z7hw==
+  dependencies:
+    "@wdio/logger" "7.16.0"
+    "@wdio/types" "7.16.0"
+    deepmerge "^4.0.0"
+    glob "^7.1.2"
+
+"@wdio/local-runner@^7.14.1":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@wdio/local-runner/-/local-runner-7.16.0.tgz#8c07ab9f369a0f0a411d41825c4a90fa4357c9af"
+  integrity sha512-PY82qgCeB62OQURmrAp61eGhuQzQ4zXehC8+NsHHiKrPgUcT4ha54LiZY5Pt3pZvGoAXOSF1RNwZlGcz5/8ZfA==
+  dependencies:
+    "@types/stream-buffers" "^3.0.3"
+    "@wdio/logger" "7.16.0"
+    "@wdio/repl" "7.16.0"
+    "@wdio/runner" "7.16.0"
+    "@wdio/types" "7.16.0"
+    async-exit-hook "^2.0.1"
+    split2 "^4.0.0"
+    stream-buffers "^3.0.2"
+
+"@wdio/logger@7.16.0", "@wdio/logger@^7.5.3":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@wdio/logger/-/logger-7.16.0.tgz#40f116ebffc23c638b8e421e350f110a058523e9"
+  integrity sha512-/6lOGb2Iow5eSsy7RJOl1kCwsP4eMlG+/QKro5zUJsuyNJSQXf2ejhpkzyKWLgQbHu83WX6cM1014AZuLkzoQg==
+  dependencies:
+    chalk "^4.0.0"
+    loglevel "^1.6.0"
+    loglevel-plugin-prefix "^0.8.4"
+    strip-ansi "^6.0.0"
+
+"@wdio/mocha-framework@^7.14.1":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@wdio/mocha-framework/-/mocha-framework-7.16.0.tgz#b5ec31669b4a63ac6d1796368ccfc712ac593f9d"
+  integrity sha512-tqxaW0br/KMwqytFtT3FDI3ESS66cI52JOp09zp8fk1FQZp+4kFs9XblGU55jqarQVxPYqf2h8+ezm+t2p3Cxg==
+  dependencies:
+    "@types/mocha" "^9.0.0"
+    "@wdio/logger" "7.16.0"
+    "@wdio/types" "7.16.0"
+    "@wdio/utils" "7.16.0"
+    expect-webdriverio "^3.0.0"
+    mocha "^9.0.0"
+
+"@wdio/protocols@7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@wdio/protocols/-/protocols-7.16.0.tgz#76887cad1e88fd74769f0cb2ce43e681593e192b"
+  integrity sha512-95z2sJZ3W+J1z8gPAlvxRH45Ct/ZMl8+m8cDj1zrnrJ9VcWW7seW6ksyBUSegyQ0S6JmeR6qqIKhewDpjq0NSw==
+
+"@wdio/repl@7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@wdio/repl/-/repl-7.16.0.tgz#dfe0992519710c9bc4cdb60b4db1f1bbaf4cfa1a"
+  integrity sha512-FI4E5MLI81sb125TvLV4DHsxd+2XjXxzxTaaCSx+/GBNuR8JjC2/GhCJV9v7jb7mxBSX18ab2+t8dkKlAqWACA==
+  dependencies:
+    "@wdio/utils" "7.16.0"
+
+"@wdio/reporter@7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@wdio/reporter/-/reporter-7.16.0.tgz#92a6dd1ab134dc65db4739dfde3db8adafe53895"
+  integrity sha512-u4rBmj0QQSxJ/LKlpIk1N2/wwjO3VmKPNJ6DXsfgkgbxjldzDOms4NXvM/l2O/Ej74p42K9OHEJXf//s1zqS8Q==
+  dependencies:
+    "@types/diff" "^5.0.0"
+    "@types/node" "^16.11.1"
+    "@types/object-inspect" "^1.8.0"
+    "@types/supports-color" "^8.1.0"
+    "@types/tmp" "^0.2.0"
+    "@wdio/types" "7.16.0"
+    diff "^5.0.0"
+    fs-extra "^10.0.0"
+    object-inspect "^1.10.3"
+    supports-color "8.1.1"
+
+"@wdio/runner@7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@wdio/runner/-/runner-7.16.0.tgz#536ca9f8009c1d3c08dece48242d6b596f4f35be"
+  integrity sha512-G6AElg5yhexe7ioB65kQGebKv0rRUMR2rt8w+igq4f3CUBqGKVDiYZIJqNAhzndjJ/A/BDzZRyRUcdMPzezPYg==
+  dependencies:
+    "@wdio/config" "7.16.0"
+    "@wdio/logger" "7.16.0"
+    "@wdio/types" "7.16.0"
+    "@wdio/utils" "7.16.0"
+    deepmerge "^4.0.0"
+    gaze "^1.1.2"
+    webdriver "7.16.0"
+    webdriverio "7.16.0"
+
+"@wdio/spec-reporter@^7.14.1":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@wdio/spec-reporter/-/spec-reporter-7.16.0.tgz#0af1261b8204e2dc0e07aaf17ce8bb590e27cc82"
+  integrity sha512-8dj+OZ7S89mT27yXPzsuj1nCWnZtwGUw0E7h4Kl9lKRrDGsz8qddIpxNrP9NTDBgNmvlW4+hP6uWDm4rjxqIjw==
+  dependencies:
+    "@types/easy-table" "^0.0.33"
+    "@wdio/reporter" "7.16.0"
+    "@wdio/types" "7.16.0"
+    chalk "^4.0.0"
+    easy-table "^1.1.1"
+    pretty-ms "^7.0.0"
+
+"@wdio/types@7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@wdio/types/-/types-7.16.0.tgz#4c86f1d38e044c2e7bd1e55bbbc2075ff8d444dc"
+  integrity sha512-qXl+icSQQ9tKn3lgpjuxMFtHj34r74/JlaHxGTgjzP8ghDDJCn1xH94mUL5C0MBBeNezxvfWYOb+DzxiQoqblw==
+  dependencies:
+    "@types/node" "^16.11.1"
+    got "^11.8.1"
+
+"@wdio/utils@7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@wdio/utils/-/utils-7.16.0.tgz#ffab38d12ce27277c4dafd44c002f417fc85b7b1"
+  integrity sha512-eSZWkSmVTfQU+lVOK8KUn5AXagpzC2BseGWDsqZME47BwoKtov3H7q6xfalDG89YkZMgO8K04RAlEDDRNodUMA==
+  dependencies:
+    "@wdio/logger" "7.16.0"
+    "@wdio/types" "7.16.0"
+    p-iteration "^1.1.8"
+
+"@zxing/browser@^0.0.9":
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/@zxing/browser/-/browser-0.0.9.tgz#1227bec71a7c9f9f4a697c2f029dc82ba0cbb56e"
+  integrity sha512-yqYz/FHQXbUnfSK+oeDXUa4ezC/qdXkVpqEFAnxM7LqIWvNWEQyUpdaTr0X6MGtIcP0Smakj5D8J7/l276plBw==
+  optionalDependencies:
+    "@zxing/text-encoding" "^0.9.0"
+
+"@zxing/text-encoding@^0.9.0":
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/@zxing/text-encoding/-/text-encoding-0.9.0.tgz#fb50ffabc6c7c66a0c96b4c03e3d9be74864b70b"
+  integrity sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==
+
+agent-base@6:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
+
+ansi-colors@4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+
+ansi-escapes@^4.2.1:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
+  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
+  dependencies:
+    type-fest "^0.21.3"
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+ansi-styles@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
+  integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
+
+anymatch@~3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
+archiver-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2"
+  integrity sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==
+  dependencies:
+    glob "^7.1.4"
+    graceful-fs "^4.2.0"
+    lazystream "^1.0.0"
+    lodash.defaults "^4.2.0"
+    lodash.difference "^4.5.0"
+    lodash.flatten "^4.4.0"
+    lodash.isplainobject "^4.0.6"
+    lodash.union "^4.6.0"
+    normalize-path "^3.0.0"
+    readable-stream "^2.0.0"
+
+archiver@^5.0.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.3.0.tgz#dd3e097624481741df626267564f7dd8640a45ba"
+  integrity sha512-iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg==
+  dependencies:
+    archiver-utils "^2.1.0"
+    async "^3.2.0"
+    buffer-crc32 "^0.2.1"
+    readable-stream "^3.6.0"
+    readdir-glob "^1.0.0"
+    tar-stream "^2.2.0"
+    zip-stream "^4.1.0"
+
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
+aria-query@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.0.0.tgz#210c21aaf469613ee8c9a62c7f86525e058db52c"
+  integrity sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==
+
+async-exit-hook@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3"
+  integrity sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==
+
+async@0.9.x:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
+  integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=
+
+async@^3.2.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz#d3274ec66d107a47476a4c49136aacdb00665fc8"
+  integrity sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg==
+
+at-least-node@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
+  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
+
+atob@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+
+balanced-match@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
+base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
+binary-extensions@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+
+bl@^4.0.3, bl@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
+  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
+  dependencies:
+    buffer "^5.5.0"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^3.0.1, braces@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+browser-stdout@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
+  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
+
+buffer-crc32@^0.2.1, buffer-crc32@^0.2.13, buffer-crc32@~0.2.3:
+  version "0.2.13"
+  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
+  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
+
+buffer@^5.2.1, buffer@^5.5.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
+
+cac@^3.0.3:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/cac/-/cac-3.0.4.tgz#6d24ceec372efe5c9b798808bc7f49b47242a4ef"
+  integrity sha1-bSTO7Dcu/lybeYgIvH9JtHJCpO8=
+  dependencies:
+    camelcase-keys "^3.0.0"
+    chalk "^1.1.3"
+    indent-string "^3.0.0"
+    minimist "^1.2.0"
+    read-pkg-up "^1.0.1"
+    suffix "^0.1.0"
+    text-table "^0.2.0"
+
+cacheable-lookup@^5.0.3:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
+  integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==
+
+cacheable-request@^7.0.1:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27"
+  integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==
+  dependencies:
+    clone-response "^1.0.2"
+    get-stream "^5.1.0"
+    http-cache-semantics "^4.0.0"
+    keyv "^4.0.0"
+    lowercase-keys "^2.0.0"
+    normalize-url "^6.0.1"
+    responselike "^2.0.0"
+
+camelcase-keys@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-3.0.0.tgz#fc0c6c360363f7377e3793b9a16bccf1070c1ca4"
+  integrity sha1-/AxsNgNj9zd+N5O5oWvM8QcMHKQ=
+  dependencies:
+    camelcase "^3.0.0"
+    map-obj "^1.0.0"
+
+camelcase@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
+
+camelcase@^6.0.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
+  integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
+
+chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
+chalk@^2.0.0, chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
+
+chokidar@3.5.2, chokidar@^3.0.0:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
+  integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
+chownr@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
+
+chrome-launcher@^0.14.0:
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/chrome-launcher/-/chrome-launcher-0.14.1.tgz#e885e706f26cc7a07d348e730fe12f15e43b0881"
+  integrity sha512-iQ4s61NkIyaozsE2VKg1Vu3YGdD3JGw+fBBrt3FYJi7uflO9TvlTLW4MUq0fq3EKGhzB/QHPd5AsLb14+9++JQ==
+  dependencies:
+    "@types/node" "*"
+    escape-string-regexp "^4.0.0"
+    is-wsl "^2.2.0"
+    lighthouse-logger "^1.0.0"
+
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
+cli-spinners@^2.1.0, cli-spinners@^2.5.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d"
+  integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==
+
+cli-width@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
+  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
+
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
+clone-response@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
+  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
+  dependencies:
+    mimic-response "^1.0.0"
+
+clone@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+compress-commons@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.1.tgz#df2a09a7ed17447642bad10a85cc9a19e5c42a7d"
+  integrity sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==
+  dependencies:
+    buffer-crc32 "^0.2.13"
+    crc32-stream "^4.0.2"
+    normalize-path "^3.0.0"
+    readable-stream "^3.6.0"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+core-util-is@~1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
+
+crc-32@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208"
+  integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==
+  dependencies:
+    exit-on-epipe "~1.0.1"
+    printj "~1.1.0"
+
+crc32-stream@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.2.tgz#c922ad22b38395abe9d3870f02fa8134ed709007"
+  integrity sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==
+  dependencies:
+    crc-32 "^1.2.0"
+    readable-stream "^3.4.0"
+
+cross-spawn@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
+  integrity sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=
+  dependencies:
+    lru-cache "^4.0.1"
+    which "^1.2.9"
+
+css-shorthand-properties@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/css-shorthand-properties/-/css-shorthand-properties-1.1.1.tgz#1c808e63553c283f289f2dd56fcee8f3337bd935"
+  integrity sha512-Md+Juc7M3uOdbAFwOYlTrccIZ7oCFuzrhKYQjdeUEW/sE1hv17Jp/Bws+ReOPpGVBTYCBoYo+G17V5Qo8QQ75A==
+
+css-value@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/css-value/-/css-value-0.0.1.tgz#5efd6c2eea5ea1fd6b6ac57ec0427b18452424ea"
+  integrity sha1-Xv1sLupeof1rasV+wEJ7GEUkJOo=
+
+debug@4, debug@4.3.2, debug@^4.1.1:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
+  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
+  dependencies:
+    ms "2.1.2"
+
+debug@4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
+  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
+  dependencies:
+    ms "2.1.2"
+
+debug@^2.6.9:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+decamelize@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837"
+  integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==
+
+decompress-response@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
+  integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==
+  dependencies:
+    mimic-response "^3.1.0"
+
+deepmerge@^4.0.0:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
+  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
+
+defaults@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
+  dependencies:
+    clone "^1.0.2"
+
+defer-to-connect@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
+  integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==
+
+devtools-protocol@0.0.901419:
+  version "0.0.901419"
+  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.901419.tgz#79b5459c48fe7e1c5563c02bd72f8fec3e0cebcd"
+  integrity sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ==
+
+devtools-protocol@^0.0.928170:
+  version "0.0.928170"
+  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.928170.tgz#4a21610efd01b5744d02bd0fc3fef87f825d0277"
+  integrity sha512-zLPUM55N6OvUzIeCz8ceD48Hm310c4nC4vqrCfAtRlhv7zoSDl3BAeuCmFLHhgA60QF38vMb2YIGAq+BP6QMMA==
+
+devtools@7.16.0:
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/devtools/-/devtools-7.16.0.tgz#c78ddeb446358201286537bfe45c285114b3881e"
+  integrity sha512-W4r2Y5KhXi+w/qQrONxRsBM2hJBVZXv7qm2eoRRCto8vmR+TkJzS/TrD9hOn2XEM/EjcUGHzGEhwOf3NqyPKEQ==
+  dependencies:
+    "@types/node" "^16.11.1"
+    "@wdio/config" "7.16.0"
+    "@wdio/logger" "7.16.0"
+    "@wdio/protocols" "7.16.0"
+    "@wdio/types" "7.16.0"
+    "@wdio/utils" "7.16.0"
+    chrome-launcher "^0.14.0"
+    edge-paths "^2.1.0"
+    puppeteer-core "^10.1.0"
+    query-selector-shadow-dom "^1.0.0"
+    ua-parser-js "^0.7.21"
+    uuid "^8.0.0"
+
+diff-sequences@^27.0.6:
+  version "27.0.6"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.0.6.tgz#3305cb2e55a033924054695cc66019fd7f8e5723"
+  integrity sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ==
+
+diff@5.0.0, diff@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
+  integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
+
+easy-table@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/easy-table/-/easy-table-1.2.0.tgz#ba9225d7138fee307bfd4f0b5bc3c04bdc7c54eb"
+  integrity sha512-OFzVOv03YpvtcWGe5AayU5G2hgybsg3iqA6drU8UaoZyB9jLGMTrz9+asnLp/E+6qPh88yEI1gvyZFZ41dmgww==
+  dependencies:
+    ansi-regex "^5.0.1"
+  optionalDependencies:
+    wcwidth "^1.0.1"
+
+edge-paths@^2.1.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/edge-paths/-/edge-paths-2.2.1.tgz#d2d91513225c06514aeac9843bfce546abbf4391"
+  integrity sha512-AI5fC7dfDmCdKo3m5y7PkYE8m6bMqR6pvVpgtrZkkhcJXFLelUgkjrhk3kXXx8Kbw2cRaTT4LkOR7hqf39KJdw==
+  dependencies:
+    "@types/which" "^1.3.2"
+    which "^2.0.2"
+
+ejs@^3.0.1:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a"
+  integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==
+  dependencies:
+    jake "^10.6.1"
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+end-of-stream@^1.1.0, end-of-stream@^1.4.1:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
+
+error-ex@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
+  dependencies:
+    is-arrayish "^0.2.1"
+
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
+escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+escape-string-regexp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
+  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
+
+exit-on-epipe@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692"
+  integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==
+
+expect-webdriverio@^3.0.0:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/expect-webdriverio/-/expect-webdriverio-3.1.4.tgz#78d379e23fff1ce1a45ded8d2168734df0ededa3"
+  integrity sha512-65FTS3bmxcIp0cq6fLb/72TrCQXBCpwPLC7SwMWdpPlLq461mXcK1BPKJJjnIC587aXSKD+3E4hvnlCtwDmXfg==
+  dependencies:
+    expect "^27.0.2"
+    jest-matcher-utils "^27.0.2"
+
+expect@^27.0.2:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-27.3.1.tgz#d0f170b1f5c8a2009bab0beffd4bb94f043e38e7"
+  integrity sha512-MrNXV2sL9iDRebWPGOGFdPQRl2eDQNu/uhxIMShjjx74T6kC6jFIkmQ6OqXDtevjGUkyB2IT56RzDBqXf/QPCg==
+  dependencies:
+    "@jest/types" "^27.2.5"
+    ansi-styles "^5.0.0"
+    jest-get-type "^27.3.1"
+    jest-matcher-utils "^27.3.1"
+    jest-message-util "^27.3.1"
+    jest-regex-util "^27.0.6"
+
+external-editor@^3.0.3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
+  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
+  dependencies:
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
+    tmp "^0.0.33"
+
+extract-zip@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
+  integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
+  dependencies:
+    debug "^4.1.1"
+    get-stream "^5.1.0"
+    yauzl "^2.10.0"
+  optionalDependencies:
+    "@types/yauzl" "^2.9.1"
+
+fast-deep-equal@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
+
+fd-slicer@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
+  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
+  dependencies:
+    pend "~1.2.0"
+
+figures@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+filelist@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b"
+  integrity sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==
+  dependencies:
+    minimatch "^3.0.4"
+
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+find-up@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
+find-up@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
+  dependencies:
+    path-exists "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+find-up@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
+flat@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
+  integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
+
+fs-constants@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+
+fs-extra@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1"
+  integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
+fs-extra@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
+  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
+  dependencies:
+    at-least-node "^1.0.0"
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+fsevents@~2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
+gaze@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
+  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
+  dependencies:
+    globule "^1.0.0"
+
+get-caller-file@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-port@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
+  integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==
+
+get-stream@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
+  dependencies:
+    pump "^3.0.0"
+
+glob-parent@~5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob@7.1.7, glob@~7.1.1:
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
+  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+globule@^1.0.0:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.3.tgz#811919eeac1ab7344e905f2e3be80a13447973c2"
+  integrity sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==
+  dependencies:
+    glob "~7.1.1"
+    lodash "~4.17.10"
+    minimatch "~3.0.2"
+
+got@^11.0.2, got@^11.8.1:
+  version "11.8.2"
+  resolved "https://registry.yarnpkg.com/got/-/got-11.8.2.tgz#7abb3959ea28c31f3576f1576c1effce23f33599"
+  integrity sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ==
+  dependencies:
+    "@sindresorhus/is" "^4.0.0"
+    "@szmarczak/http-timer" "^4.0.5"
+    "@types/cacheable-request" "^6.0.1"
+    "@types/responselike" "^1.0.0"
+    cacheable-lookup "^5.0.3"
+    cacheable-request "^7.0.1"
+    decompress-response "^6.0.0"
+    http2-wrapper "^1.0.0-beta.5.2"
+    lowercase-keys "^2.0.0"
+    p-cancelable "^2.0.0"
+    responselike "^2.0.0"
+
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
+  integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
+
+grapheme-splitter@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
+  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+
+growl@1.10.5:
+  version "1.10.5"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
+  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
+  dependencies:
+    ansi-regex "^2.0.0"
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
+has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
+he@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
+
+hosted-git-info@^2.1.4:
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
+
+http-cache-semantics@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
+  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+
+http2-wrapper@^1.0.0-beta.5.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d"
+  integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==
+  dependencies:
+    quick-lru "^5.1.1"
+    resolve-alpn "^1.0.0"
+
+https-proxy-agent@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
+iconv-lite@^0.4.24:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+ieee754@^1.1.13:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+
+indent-string@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
+  integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+inquirer@8.1.5:
+  version "8.1.5"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.1.5.tgz#2dc5159203c826d654915b5fe6990fd17f54a150"
+  integrity sha512-G6/9xUqmt/r+UvufSyrPpt84NYwhKZ9jLsgMbQzlx804XErNupor8WQdBnBRrXmBfTPpuwf1sV+ss2ovjgdXIg==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    chalk "^4.1.1"
+    cli-cursor "^3.1.0"
+    cli-width "^3.0.0"
+    external-editor "^3.0.3"
+    figures "^3.0.0"
+    lodash "^4.17.21"
+    mute-stream "0.0.8"
+    ora "^5.4.1"
+    run-async "^2.4.0"
+    rxjs "^7.2.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+    through "^2.3.6"
+
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
+is-core-module@^2.2.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548"
+  integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==
+  dependencies:
+    has "^1.0.3"
+
+is-docker@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
+  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
+
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-glob@^4.0.1, is-glob@~4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-interactive@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
+  integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-plain-obj@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
+  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
+
+is-unicode-supported@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
+  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
+
+is-utf8@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
+
+is-wsl@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
+  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
+  dependencies:
+    is-docker "^2.0.0"
+
+isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+jake@^10.6.1:
+  version "10.8.2"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"
+  integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==
+  dependencies:
+    async "0.9.x"
+    chalk "^2.4.2"
+    filelist "^1.0.1"
+    minimatch "^3.0.4"
+
+jest-diff@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.3.1.tgz#d2775fea15411f5f5aeda2a5e02c2f36440f6d55"
+  integrity sha512-PCeuAH4AWUo2O5+ksW4pL9v5xJAcIKPUPfIhZBcG1RKv/0+dvaWTQK1Nrau8d67dp65fOqbeMdoil+6PedyEPQ==
+  dependencies:
+    chalk "^4.0.0"
+    diff-sequences "^27.0.6"
+    jest-get-type "^27.3.1"
+    pretty-format "^27.3.1"
+
+jest-get-type@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.3.1.tgz#a8a2b0a12b50169773099eee60a0e6dd11423eff"
+  integrity sha512-+Ilqi8hgHSAdhlQ3s12CAVNd8H96ZkQBfYoXmArzZnOfAtVAJEiPDBirjByEblvG/4LPJmkL+nBqPO3A1YJAEg==
+
+jest-matcher-utils@^27.0.2, jest-matcher-utils@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.3.1.tgz#257ad61e54a6d4044e080d85dbdc4a08811e9c1c"
+  integrity sha512-hX8N7zXS4k+8bC1Aj0OWpGb7D3gIXxYvPNK1inP5xvE4ztbz3rc4AkI6jGVaerepBnfWB17FL5lWFJT3s7qo8w==
+  dependencies:
+    chalk "^4.0.0"
+    jest-diff "^27.3.1"
+    jest-get-type "^27.3.1"
+    pretty-format "^27.3.1"
+
+jest-message-util@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.3.1.tgz#f7c25688ad3410ab10bcb862bcfe3152345c6436"
+  integrity sha512-bh3JEmxsTZ/9rTm0jQrPElbY2+y48Rw2t47uMfByNyUVR+OfPh4anuyKsGqsNkXk/TI4JbLRZx+7p7Hdt6q1yg==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@jest/types" "^27.2.5"
+    "@types/stack-utils" "^2.0.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.4"
+    micromatch "^4.0.4"
+    pretty-format "^27.3.1"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
+
+jest-regex-util@^27.0.6:
+  version "27.0.6"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.6.tgz#02e112082935ae949ce5d13b2675db3d8c87d9c5"
+  integrity sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ==
+
+js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
+js-yaml@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
+json-buffer@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
+
+jsonfile@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
+  dependencies:
+    universalify "^2.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+keyv@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.0.3.tgz#4f3aa98de254803cafcd2896734108daa35e4254"
+  integrity sha512-zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA==
+  dependencies:
+    json-buffer "3.0.1"
+
+ky@^0.28.5:
+  version "0.28.6"
+  resolved "https://registry.yarnpkg.com/ky/-/ky-0.28.6.tgz#3dfe7a33be3e3d3c99a19d1703ec7a5dcb662ec5"
+  integrity sha512-EjxET5qSsaLUj1BSFtxPjEtRgF5JOhdroPwMNJFH/VvzruWQFBmh6W7GtqjBR56UZw4dBFTKLvx9nDxxnFXc7w==
+
+lazystream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
+  integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=
+  dependencies:
+    readable-stream "^2.0.5"
+
+lighthouse-logger@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/lighthouse-logger/-/lighthouse-logger-1.3.0.tgz#ba6303e739307c4eee18f08249524e7dafd510db"
+  integrity sha512-BbqAKApLb9ywUli+0a+PcV04SyJ/N1q/8qgCNe6U97KbPCS1BTksEuHFLYdvc8DltuhfxIUBqDZsC0bBGtl3lA==
+  dependencies:
+    debug "^2.6.9"
+    marky "^1.2.2"
+
+load-json-file@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    strip-bom "^2.0.0"
+
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
+lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
+
+lodash.defaults@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
+  integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
+
+lodash.difference@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c"
+  integrity sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=
+
+lodash.flatten@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+  integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
+
+lodash.flattendeep@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
+  integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=
+
+lodash.isobject@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz#3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d"
+  integrity sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=
+
+lodash.isplainobject@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
+
+lodash.merge@^4.6.1:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
+lodash.pickby@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff"
+  integrity sha1-feoh2MGNdwOifHBMFdO4SmfjOv8=
+
+lodash.union@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
+  integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=
+
+lodash.zip@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.zip/-/lodash.zip-4.2.0.tgz#ec6662e4896408ed4ab6c542a3990b72cc080020"
+  integrity sha1-7GZi5IlkCO1KtsVCo5kLcswIACA=
+
+lodash@^4.17.21, lodash@~4.17.10:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
+log-symbols@4.1.0, log-symbols@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
+  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
+  dependencies:
+    chalk "^4.1.0"
+    is-unicode-supported "^0.1.0"
+
+loglevel-plugin-prefix@^0.8.4:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/loglevel-plugin-prefix/-/loglevel-plugin-prefix-0.8.4.tgz#2fe0e05f1a820317d98d8c123e634c1bd84ff644"
+  integrity sha512-WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g==
+
+loglevel@^1.6.0:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
+  integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
+
+lowercase-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
+  integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
+
+lru-cache@^4.0.1:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
+map-obj@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
+
+marky@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/marky/-/marky-1.2.2.tgz#4456765b4de307a13d263a69b0c79bf226e68323"
+  integrity sha512-k1dB2HNeaNyORco8ulVEhctyEGkKHb2YWAhDsxeFlW2nROIirsctBYzKwwS3Vza+sKTS1zO4Z+n9/+9WbGLIxQ==
+
+micromatch@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
+  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.2.3"
+
+mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
+mimic-response@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
+  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
+
+mimic-response@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
+  integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
+
+minimatch@3.0.4, minimatch@^3.0.4, minimatch@~3.0.2:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@^1.2.0, minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
+mkdirp@^0.5.1:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+  dependencies:
+    minimist "^1.2.5"
+
+mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
+mocha@^9.0.0:
+  version "9.1.3"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.1.3.tgz#8a623be6b323810493d8c8f6f7667440fa469fdb"
+  integrity sha512-Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw==
+  dependencies:
+    "@ungap/promise-all-settled" "1.1.2"
+    ansi-colors "4.1.1"
+    browser-stdout "1.3.1"
+    chokidar "3.5.2"
+    debug "4.3.2"
+    diff "5.0.0"
+    escape-string-regexp "4.0.0"
+    find-up "5.0.0"
+    glob "7.1.7"
+    growl "1.10.5"
+    he "1.2.0"
+    js-yaml "4.1.0"
+    log-symbols "4.1.0"
+    minimatch "3.0.4"
+    ms "2.1.3"
+    nanoid "3.1.25"
+    serialize-javascript "6.0.0"
+    strip-json-comments "3.1.1"
+    supports-color "8.1.1"
+    which "2.0.2"
+    workerpool "6.1.5"
+    yargs "16.2.0"
+    yargs-parser "20.2.4"
+    yargs-unparser "2.0.0"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+ms@2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
+mute-stream@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+
+nanoid@3.1.25:
+  version "3.1.25"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152"
+  integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==
+
+node-fetch@2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+
+normalize-package-data@^2.3.2:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
+  dependencies:
+    hosted-git-info "^2.1.4"
+    resolve "^1.10.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
+normalize-path@^3.0.0, normalize-path@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
+normalize-url@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
+  integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
+
+object-inspect@^1.10.3:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
+  integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
+
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+onetime@^5.1.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
+  dependencies:
+    mimic-fn "^2.1.0"
+
+ora@^5.4.1:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
+  integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==
+  dependencies:
+    bl "^4.1.0"
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-spinners "^2.5.0"
+    is-interactive "^1.0.0"
+    is-unicode-supported "^0.1.0"
+    log-symbols "^4.1.0"
+    strip-ansi "^6.0.0"
+    wcwidth "^1.0.1"
+
+os-tmpdir@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+
+p-cancelable@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
+  integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==
+
+p-iteration@^1.1.8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/p-iteration/-/p-iteration-1.1.8.tgz#14df726d55af368beba81bcc92a26bb1b48e714a"
+  integrity sha512-IMFBSDIYcPNnW7uWYGrBqmvTiq7W0uB0fJn6shQZs7dlF3OvrHOre+JT9ikSZ7gZS3vWqclVgoQSvToJrns7uQ==
+
+p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
+p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
+parse-json@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
+  dependencies:
+    error-ex "^1.2.0"
+
+parse-ms@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-2.1.0.tgz#348565a753d4391fa524029956b172cb7753097d"
+  integrity sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==
+
+path-exists@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
+  dependencies:
+    pinkie-promise "^2.0.0"
+
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+path-parse@^1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
+
+path-type@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
+  dependencies:
+    graceful-fs "^4.1.2"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+pend@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
+  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
+
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
+  integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
+
+pify@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+
+pkg-dir@4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+  dependencies:
+    find-up "^4.0.0"
+
+pretty-format@^27.3.1:
+  version "27.3.1"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.3.1.tgz#7e9486365ccdd4a502061fa761d3ab9ca1b78df5"
+  integrity sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA==
+  dependencies:
+    "@jest/types" "^27.2.5"
+    ansi-regex "^5.0.1"
+    ansi-styles "^5.0.0"
+    react-is "^17.0.1"
+
+pretty-ms@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-7.0.1.tgz#7d903eaab281f7d8e03c66f867e239dc32fb73e8"
+  integrity sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==
+  dependencies:
+    parse-ms "^2.1.0"
+
+printj@~1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"
+  integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==
+
+process-nextick-args@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+
+progress@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.1.tgz#c9242169342b1c29d275889c95734621b1952e31"
+  integrity sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==
+
+proxy-from-env@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
+pseudomap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
+
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+puppeteer-core@^10.1.0:
+  version "10.4.0"
+  resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-10.4.0.tgz#4e2da57c52339b8c07cd9362922020eb3c3c95bf"
+  integrity sha512-KU8zyb7AIOqNjLCN3wkrFXxh+EVaG+zrs2P03ATNjc3iwSxHsu5/EvZiREpQ/IJiT9xfQbDVgKcsvRuzLCxglQ==
+  dependencies:
+    debug "4.3.1"
+    devtools-protocol "0.0.901419"
+    extract-zip "2.0.1"
+    https-proxy-agent "5.0.0"
+    node-fetch "2.6.1"
+    pkg-dir "4.2.0"
+    progress "2.0.1"
+    proxy-from-env "1.1.0"
+    rimraf "3.0.2"
+    tar-fs "2.0.0"
+    unbzip2-stream "1.3.3"
+    ws "7.4.6"
+
+query-selector-shadow-dom@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/query-selector-shadow-dom/-/query-selector-shadow-dom-1.0.0.tgz#8fa7459a4620f094457640e74e953a9dbe61a38e"
+  integrity sha512-bK0/0cCI+R8ZmOF1QjT7HupDUYCxbf/9TJgAmSXQxZpftXmTAeil9DRoCnTDkWbvOyZzhcMBwKpptWcdkGFIMg==
+
+quick-lru@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
+  integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
+
+randombytes@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
+  dependencies:
+    safe-buffer "^5.1.0"
+
+react-is@^17.0.1:
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
+  integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
+
+read-pkg-up@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
+  dependencies:
+    find-up "^1.0.0"
+    read-pkg "^1.0.0"
+
+read-pkg@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
+  dependencies:
+    load-json-file "^1.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^1.0.0"
+
+readable-stream@^2.0.0, readable-stream@^2.0.5:
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+readable-stream@^3.0.0, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
+readdir-glob@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.1.tgz#f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4"
+  integrity sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA==
+  dependencies:
+    minimatch "^3.0.4"
+
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
+  dependencies:
+    picomatch "^2.2.1"
+
+recursive-readdir@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f"
+  integrity sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==
+  dependencies:
+    minimatch "3.0.4"
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+resolve-alpn@^1.0.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
+  integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==
+
+resolve@^1.10.0:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
+  dependencies:
+    is-core-module "^2.2.0"
+    path-parse "^1.0.6"
+
+responselike@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.0.tgz#26391bcc3174f750f9a79eacc40a12a5c42d7723"
+  integrity sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==
+  dependencies:
+    lowercase-keys "^2.0.0"
+
+resq@^1.9.1:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/resq/-/resq-1.10.1.tgz#c05d1b3808016cceec4d485ceb375acb49565f53"
+  integrity sha512-zhp1iyUH02MLciv3bIM2bNtTFx/fqRsK4Jk73jcPqp00d/sMTTjOtjdTMAcgjrQKGx5DvQ/HSpeqaMW0atGRJA==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
+rgb2hex@0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/rgb2hex/-/rgb2hex-0.2.5.tgz#f82230cd3ab1364fa73c99be3a691ed688f8dbdc"
+  integrity sha512-22MOP1Rh7sAo1BZpDG6R5RFYzR2lYEgwq7HEmyW2qcsOqR2lQKmn+O//xV3YG/0rrhMC6KVX2hU+ZXuaw9a5bw==
+
+rimraf@3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
+run-async@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
+
+rxjs@^7.2.0:
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.4.0.tgz#a12a44d7eebf016f5ff2441b87f28c9a51cebc68"
+  integrity sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==
+  dependencies:
+    tslib "~2.1.0"
+
+safe-buffer@^5.1.0, safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+"safer-buffer@>= 2.1.2 < 3":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+"semver@2 || 3 || 4 || 5":
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+serialize-error@^8.0.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-8.1.0.tgz#3a069970c712f78634942ddd50fbbc0eaebe2f67"
+  integrity sha512-3NnuWfM6vBYoy5gZFvHiYsVbafvI9vZv/+jlIigFn4oP4zjNPK3LhcY0xSCgeb1a5L8jO71Mit9LlNoi2UfDDQ==
+  dependencies:
+    type-fest "^0.20.2"
+
+serialize-javascript@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
+  integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
+  dependencies:
+    randombytes "^2.1.0"
+
+signal-exit@^3.0.2:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f"
+  integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==
+
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
+spdx-correct@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
+  dependencies:
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-exceptions@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
+
+spdx-expression-parse@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-license-ids@^3.0.0:
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz#0d9becccde7003d6c658d487dd48a32f0bf3014b"
+  integrity sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA==
+
+split2@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f"
+  integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==
+  dependencies:
+    readable-stream "^3.0.0"
+
+split2@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-4.0.0.tgz#c76cb53ad55040ddff3a9c3b73fc88a4690f047c"
+  integrity sha512-gjmavJzvQCAZzaEHWoJBOwqIUAiEvUOlguQ6uO0+0LTS1tlLa2YetTLWCrm049ouvLOa1l6SOGm3XaiRiCg9SQ==
+
+stack-utils@^2.0.3:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5"
+  integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==
+  dependencies:
+    escape-string-regexp "^2.0.0"
+
+stream-buffers@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-3.0.2.tgz#5249005a8d5c2d00b3a32e6e0a6ea209dc4f3521"
+  integrity sha512-DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ==
+
+string-width@^4.1.0, string-width@^4.2.0:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+strip-ansi@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-bom@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
+  dependencies:
+    is-utf8 "^0.2.0"
+
+strip-json-comments@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+
+suffix@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/suffix/-/suffix-0.1.1.tgz#cc58231646a0ef1102f79478ef3a9248fd9c842f"
+  integrity sha1-zFgjFkag7xEC95R47zqSSP2chC8=
+
+supports-color@8.1.1:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
+  dependencies:
+    has-flag "^4.0.0"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+tar-fs@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz#677700fc0c8b337a78bee3623fdc235f21d7afad"
+  integrity sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==
+  dependencies:
+    chownr "^1.1.1"
+    mkdirp "^0.5.1"
+    pump "^3.0.0"
+    tar-stream "^2.0.0"
+
+tar-stream@^2.0.0, tar-stream@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
+  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
+  dependencies:
+    bl "^4.0.3"
+    end-of-stream "^1.4.1"
+    fs-constants "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^3.1.1"
+
+text-table@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+
+through@^2.3.6, through@^2.3.8:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+
+tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
+  dependencies:
+    os-tmpdir "~1.0.2"
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+tslib@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
+  integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==
+
+type-fest@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
+
+type-fest@^0.21.3:
+  version "0.21.3"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
+  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
+
+ua-parser-js@^0.7.21:
+  version "0.7.28"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31"
+  integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==
+
+unbzip2-stream@1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz#d156d205e670d8d8c393e1c02ebd506422873f6a"
+  integrity sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==
+  dependencies:
+    buffer "^5.2.1"
+    through "^2.3.8"
+
+universalify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+uuid@^8.0.0:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
+validate-npm-package-license@^3.0.1:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
+  dependencies:
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
+
+wcwidth@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
+  dependencies:
+    defaults "^1.0.3"
+
+wdio-chromedriver-service@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/wdio-chromedriver-service/-/wdio-chromedriver-service-7.2.2.tgz#5e56cdd0b71e7030e782057c81bc7f90354736c8"
+  integrity sha512-fj1R6yTgcr52g1wANdBc1KH+aXjazN81WhweAc1Y6Cfm1KVehSDbrVj2BJImU+6R/7sQKRX6fqtuA4Nsc0HUXQ==
+  dependencies:
+    "@wdio/logger" "^7.5.3"
+    fs-extra "^9.1.0"
+    split2 "^3.2.2"
+
+webdriver@7.16.0:
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/webdriver/-/webdriver-7.16.0.tgz#55a6ad0827e3a12d6ff804d98f68d81656600a0f"
+  integrity sha512-MWGlfg9X9Lnz/8uFyEiiwk3PbG+/IpPoOmrfgHgM1i0KfiUiraKAS8H4gt4kQ3J33TbnotG5+mc6xGUBJ0IDdQ==
+  dependencies:
+    "@types/node" "^16.11.1"
+    "@wdio/config" "7.16.0"
+    "@wdio/logger" "7.16.0"
+    "@wdio/protocols" "7.16.0"
+    "@wdio/types" "7.16.0"
+    "@wdio/utils" "7.16.0"
+    got "^11.0.2"
+    ky "^0.28.5"
+    lodash.merge "^4.6.1"
+
+webdriverio@7.16.0:
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/webdriverio/-/webdriverio-7.16.0.tgz#2ea69873beded175c2c7bd3d2a7575a2420db3e9"
+  integrity sha512-zCRhHyr+VOk0BXSlvBJfqjqKPj6xFTI90Z0AyOaVxI5MytI9nVyySZsKyfK/r4gIcP2BAJwaxPPhaOySFmRm1Q==
+  dependencies:
+    "@types/aria-query" "^4.2.1"
+    "@types/node" "^16.11.1"
+    "@wdio/config" "7.16.0"
+    "@wdio/logger" "7.16.0"
+    "@wdio/protocols" "7.16.0"
+    "@wdio/repl" "7.16.0"
+    "@wdio/types" "7.16.0"
+    "@wdio/utils" "7.16.0"
+    archiver "^5.0.0"
+    aria-query "^5.0.0"
+    atob "^2.1.2"
+    css-shorthand-properties "^1.1.1"
+    css-value "^0.0.1"
+    devtools "7.16.0"
+    devtools-protocol "^0.0.928170"
+    fs-extra "^10.0.0"
+    get-port "^5.1.1"
+    grapheme-splitter "^1.0.2"
+    lodash.clonedeep "^4.5.0"
+    lodash.isobject "^3.0.2"
+    lodash.isplainobject "^4.0.6"
+    lodash.zip "^4.2.0"
+    minimatch "^3.0.4"
+    puppeteer-core "^10.1.0"
+    query-selector-shadow-dom "^1.0.0"
+    resq "^1.9.1"
+    rgb2hex "0.2.5"
+    serialize-error "^8.0.0"
+    webdriver "7.16.0"
+
+which@2.0.2, which@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+which@^1.2.9:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+workerpool@6.1.5:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.5.tgz#0f7cf076b6215fd7e1da903ff6f22ddd1886b581"
+  integrity sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==
+
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+ws@7.4.6:
+  version "7.4.6"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
+  integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
+
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+
+yallist@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
+
+yargs-parser@20.2.4:
+  version "20.2.4"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
+  integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
+
+yargs-parser@^20.2.2:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
+
+yargs-unparser@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb"
+  integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==
+  dependencies:
+    camelcase "^6.0.0"
+    decamelize "^4.0.0"
+    flat "^5.0.2"
+    is-plain-obj "^2.1.0"
+
+yargs@16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
+yargs@^17.0.0:
+  version "17.2.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.2.1.tgz#e2c95b9796a0e1f7f3bf4427863b42e0418191ea"
+  integrity sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
+yarn-install@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/yarn-install/-/yarn-install-1.0.0.tgz#57f45050b82efd57182b3973c54aa05cb5d25230"
+  integrity sha1-V/RQULgu/VcYKzlzxUqgXLXSUjA=
+  dependencies:
+    cac "^3.0.3"
+    chalk "^1.1.3"
+    cross-spawn "^4.0.2"
+
+yauzl@^2.10.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
+  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
+  dependencies:
+    buffer-crc32 "~0.2.3"
+    fd-slicer "~1.1.0"
+
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
+zip-stream@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.1.0.tgz#51dd326571544e36aa3f756430b313576dc8fc79"
+  integrity sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==
+  dependencies:
+    archiver-utils "^2.1.0"
+    compress-commons "^4.1.0"
+    readable-stream "^3.6.0"
diff --git a/validator-api/Cargo.toml b/validator-api/Cargo.toml
index c91d865fd6..089c8d2529 100644
--- a/validator-api/Cargo.toml
+++ b/validator-api/Cargo.toml
@@ -10,6 +10,7 @@ authors = [
     "Drazen Urch <durch@users.noreply.github.com>",
 ]
 edition = "2018"
+rust-version = "1.56"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/validator-api/migrations/20211101110000_no_gateway_rewarding.sql b/validator-api/migrations/20211101110000_no_gateway_rewarding.sql
new file mode 100644
index 0000000000..542ef02b3e
--- /dev/null
+++ b/validator-api/migrations/20211101110000_no_gateway_rewarding.sql
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+ALTER TABLE rewarding_report RENAME TO _rewarding_report_old;
+
+CREATE TABLE rewarding_report
+(
+    epoch_rewarding_id           INTEGER NOT NULL,
+
+    eligible_mixnodes            INTEGER NOT NULL,
+
+    possibly_unrewarded_mixnodes INTEGER NOT NULL,
+
+    FOREIGN KEY (epoch_rewarding_id) REFERENCES epoch_rewarding (id)
+);
+
+INSERT INTO rewarding_report (epoch_rewarding_id, eligible_mixnodes, possibly_unrewarded_mixnodes)
+SELECT epoch_rewarding_id, eligible_mixnodes, possibly_unrewarded_mixnodes
+FROM _rewarding_report_old;
+
+DROP TABLE _rewarding_report_old;
+DROP TABLE failed_gateway_reward_chunk;
+DROP TABLE possibly_unrewarded_gateway;
\ No newline at end of file
diff --git a/validator-api/src/cache/mod.rs b/validator-api/src/cache/mod.rs
index dfa4424659..7a1cf9864b 100644
--- a/validator-api/src/cache/mod.rs
+++ b/validator-api/src/cache/mod.rs
@@ -33,10 +33,7 @@ struct ValidatorCacheInner {
     gateways: RwLock<Cache<Vec<GatewayBond>>>,
 
     active_mixnodes_available: AtomicBool,
-    active_gateways_available: AtomicBool,
-
     current_mixnode_active_set_size: AtomicUsize,
-    current_gateway_active_set_size: AtomicUsize,
 }
 
 #[derive(Default, Serialize, Clone)]
@@ -131,7 +128,6 @@ impl ValidatorCache {
                     routes::get_mixnodes,
                     routes::get_gateways,
                     routes::get_active_mixnodes,
-                    routes::get_active_gateways
                 ],
             )
         })
@@ -155,28 +151,10 @@ impl ValidatorCache {
         true
     }
 
-    // TODO: check if all nodes can be compared together,
-    // i.e. they all have the same denom for bonds and delegations
-    fn verify_gateways(&self, gateways: &[GatewayBond]) -> bool {
-        if gateways.is_empty() {
-            return true;
-        }
-        let expected_denom = &gateways[0].bond_amount.denom;
-        for gateway in gateways {
-            if &gateway.bond_amount.denom != expected_denom
-                || &gateway.total_delegation.denom != expected_denom
-            {
-                return false;
-            }
-        }
-
-        true
-    }
-
     async fn update_cache(
         &self,
         mut mixnodes: Vec<MixNodeBond>,
-        mut gateways: Vec<GatewayBond>,
+        gateways: Vec<GatewayBond>,
         state: StateParams,
     ) {
         // if our data is valid, it means the active sets are available,
@@ -199,23 +177,6 @@ impl ValidatorCache {
                 .store(false, Ordering::SeqCst);
         }
 
-        if self.verify_gateways(&gateways) {
-            // partial_cmp can only fail if the nodes have different denomination,
-            // but we just checked for that hence the unwraps are fine here
-            // Note the reverse order of comparison so that the "highest" node would be first
-            gateways.sort_by(|a, b| b.partial_cmp(a).unwrap());
-            self.inner
-                .active_gateways_available
-                .store(true, Ordering::SeqCst);
-            self.inner
-                .current_gateway_active_set_size
-                .store(state.gateway_active_set_size as usize, Ordering::SeqCst);
-        } else {
-            self.inner
-                .active_gateways_available
-                .store(false, Ordering::SeqCst);
-        }
-
         self.inner.mixnodes.write().await.set(mixnodes);
         self.inner.gateways.write().await.set(gateways);
     }
@@ -252,30 +213,6 @@ impl ValidatorCache {
         }
     }
 
-    pub async fn active_gateways(&self) -> Option<Cache<Vec<GatewayBond>>> {
-        // if active set is available, it means it is already sorted
-        if self.inner.active_gateways_available.load(Ordering::SeqCst) {
-            let cache = self.inner.gateways.read().await;
-            let timestamp = cache.as_at;
-            let nodes = cache
-                .value
-                .iter()
-                .take(
-                    self.inner
-                        .current_gateway_active_set_size
-                        .load(Ordering::SeqCst),
-                )
-                .cloned()
-                .collect();
-            Some(Cache {
-                value: nodes,
-                as_at: timestamp,
-            })
-        } else {
-            None
-        }
-    }
-
     pub fn initialised(&self) -> bool {
         self.inner.initialised.load(Ordering::Relaxed)
     }
@@ -300,9 +237,7 @@ impl ValidatorCacheInner {
             mixnodes: RwLock::new(Cache::default()),
             gateways: RwLock::new(Cache::default()),
             active_mixnodes_available: AtomicBool::new(false),
-            active_gateways_available: AtomicBool::new(false),
             current_mixnode_active_set_size: Default::default(),
-            current_gateway_active_set_size: Default::default(),
         }
     }
 }
diff --git a/validator-api/src/cache/routes.rs b/validator-api/src/cache/routes.rs
index a076aac4ac..c3e3c858aa 100644
--- a/validator-api/src/cache/routes.rs
+++ b/validator-api/src/cache/routes.rs
@@ -22,10 +22,3 @@ pub(crate) async fn get_active_mixnodes(
 ) -> Option<Json<Vec<MixNodeBond>>> {
     cache.active_mixnodes().await.map(|cache| Json(cache.value))
 }
-
-#[get("/gateways/active")]
-pub(crate) async fn get_active_gateways(
-    cache: &State<ValidatorCache>,
-) -> Option<Json<Vec<GatewayBond>>> {
-    cache.active_gateways().await.map(|cache| Json(cache.value))
-}
diff --git a/validator-api/src/main.rs b/validator-api/src/main.rs
index 842f12f15f..19a1f3b8bd 100644
--- a/validator-api/src/main.rs
+++ b/validator-api/src/main.rs
@@ -8,10 +8,11 @@ use crate::cache::ValidatorCacheRefresher;
 use crate::config::Config;
 use crate::network_monitor::tested_network::good_topology::parse_topology_file;
 use crate::network_monitor::NetworkMonitorBuilder;
+use crate::node_status_api::uptime_updater::HistoricalUptimeUpdater;
 use crate::nymd_client::Client;
 use crate::rewarding::epoch::Epoch;
 use crate::rewarding::Rewarder;
-use crate::storage::NodeStatusStorage;
+use crate::storage::ValidatorApiStorage;
 use ::config::NymConfig;
 use anyhow::Result;
 use cache::ValidatorCache;
@@ -335,7 +336,7 @@ fn setup_network_monitor<'a>(
     }
 
     // get instances of managed states
-    let node_status_storage = rocket.state::<NodeStatusStorage>().unwrap().clone();
+    let node_status_storage = rocket.state::<ValidatorApiStorage>().unwrap().clone();
     let validator_cache = rocket.state::<ValidatorCache>().unwrap().clone();
 
     let v4_topology = parse_topology_file(config.get_v4_good_topology_file());
@@ -367,7 +368,7 @@ fn setup_rewarder(
 ) -> Option<Rewarder> {
     if config.get_rewarding_enabled() && config.get_network_monitor_enabled() {
         // get instances of managed states
-        let node_status_storage = rocket.state::<NodeStatusStorage>().unwrap().clone();
+        let node_status_storage = rocket.state::<ValidatorApiStorage>().unwrap().clone();
         let validator_cache = rocket.state::<ValidatorCache>().unwrap().clone();
 
         let first_epoch = Epoch::new(
@@ -475,6 +476,12 @@ async fn main() -> Result<()> {
         // spawn our cacher
         tokio::spawn(async move { validator_cache_refresher.run().await });
 
+        // setup our daily uptime updater. Note that if network monitor is disabled, then we have
+        // no data for the updates and hence we don't need to start it up
+        let storage = rocket.state::<ValidatorApiStorage>().unwrap().clone();
+        let uptime_updater = HistoricalUptimeUpdater::new(storage);
+        tokio::spawn(async move { uptime_updater.run().await });
+
         if let Some(rewarder) = setup_rewarder(&config, &rocket, &nymd_client) {
             info!("Periodic rewarding is starting...");
             tokio::spawn(async move { rewarder.run().await });
diff --git a/validator-api/src/network_monitor/mod.rs b/validator-api/src/network_monitor/mod.rs
index 9cd9734c14..c7002866da 100644
--- a/validator-api/src/network_monitor/mod.rs
+++ b/validator-api/src/network_monitor/mod.rs
@@ -31,7 +31,15 @@ use crate::network_monitor::monitor::receiver::{
 use crate::network_monitor::monitor::sender::PacketSender;
 use crate::network_monitor::monitor::summary_producer::SummaryProducer;
 use crate::network_monitor::tested_network::TestedNetwork;
+
 use crate::storage::NodeStatusStorage;
+use crate::storage::ValidatorApiStorage;
+use crypto::asymmetric::{encryption, identity};
+use futures::channel::mpsc;
+use log::info;
+use nymsphinx::addressing::clients::Recipient;
+use std::sync::Arc;
+use topology::NymTopology;
 
 pub(crate) mod chunker;
 pub(crate) mod gateways_reader;
@@ -42,7 +50,7 @@ pub(crate) mod tested_network;
 pub(crate) struct NetworkMonitorBuilder<'a> {
     config: &'a Config,
     tested_network: TestedNetwork,
-    node_status_storage: NodeStatusStorage,
+    node_status_storage: ValidatorApiStorage,
     validator_cache: ValidatorCache,
 }
 
@@ -51,7 +59,7 @@ impl<'a> NetworkMonitorBuilder<'a> {
         config: &'a Config,
         v4_topology: NymTopology,
         v6_topology: NymTopology,
-        node_status_storage: NodeStatusStorage,
+        node_status_storage: ValidatorApiStorage,
         validator_cache: ValidatorCache,
     ) -> Self {
         let tested_network = TestedNetwork::new_good(v4_topology, v6_topology);
diff --git a/validator-api/src/network_monitor/monitor/mod.rs b/validator-api/src/network_monitor/monitor/mod.rs
index 39bbe0dda9..c4246c4100 100644
--- a/validator-api/src/network_monitor/monitor/mod.rs
+++ b/validator-api/src/network_monitor/monitor/mod.rs
@@ -8,7 +8,7 @@ use crate::network_monitor::monitor::sender::PacketSender;
 use crate::network_monitor::monitor::summary_producer::{NodeResult, SummaryProducer, TestReport};
 use crate::network_monitor::test_packet::NodeType;
 use crate::network_monitor::tested_network::TestedNetwork;
-use crate::storage::NodeStatusStorage;
+use crate::storage::ValidatorApiStorage;
 use log::{debug, error, info, warn};
 use std::process;
 use tokio::time::{sleep, Duration, Instant};
@@ -25,7 +25,7 @@ pub(super) struct Monitor {
     packet_sender: PacketSender,
     received_processor: ReceivedProcessor,
     summary_producer: SummaryProducer,
-    node_status_storage: NodeStatusStorage,
+    node_status_storage: ValidatorApiStorage,
     tested_network: TestedNetwork,
     run_interval: Duration,
     gateway_ping_interval: Duration,
@@ -39,7 +39,7 @@ impl Monitor {
         packet_sender: PacketSender,
         received_processor: ReceivedProcessor,
         summary_producer: SummaryProducer,
-        node_status_storage: NodeStatusStorage,
+        node_status_storage: ValidatorApiStorage,
         tested_network: TestedNetwork,
     ) -> Self {
         Monitor {
diff --git a/validator-api/src/node_status_api/mod.rs b/validator-api/src/node_status_api/mod.rs
index 99daeeae48..cb16bcf6d5 100644
--- a/validator-api/src/node_status_api/mod.rs
+++ b/validator-api/src/node_status_api/mod.rs
@@ -9,6 +9,7 @@ use std::time::Duration;
 pub(crate) mod local_guard;
 pub(crate) mod models;
 pub(crate) mod routes;
+pub(crate) mod uptime_updater;
 pub(crate) mod utils;
 
 pub(crate) const FIFTEEN_MINUTES: Duration = Duration::from_secs(900);
@@ -18,7 +19,7 @@ pub(crate) const ONE_DAY: Duration = Duration::from_secs(86400);
 pub(crate) fn stage(database_path: PathBuf) -> AdHoc {
     AdHoc::on_ignite("SQLx Stage", |rocket| async {
         rocket
-            .attach(storage::NodeStatusStorage::stage(database_path))
+            .attach(storage::ValidatorApiStorage::stage(database_path))
             .mount(
                 "/v1/status",
                 routes![
diff --git a/validator-api/src/node_status_api/models.rs b/validator-api/src/node_status_api/models.rs
index d39d8239b0..308e3a91d1 100644
--- a/validator-api/src/node_status_api/models.rs
+++ b/validator-api/src/node_status_api/models.rs
@@ -213,12 +213,12 @@ pub struct HistoricalUptime {
 }
 
 pub(crate) struct ErrorResponse {
-    error: NodeStatusApiError,
+    error: ValidatorApiStorageError,
     status: Status,
 }
 
 impl ErrorResponse {
-    pub(crate) fn new(error: NodeStatusApiError, status: Status) -> Self {
+    pub(crate) fn new(error: ValidatorApiStorageError, status: Status) -> Self {
         ErrorResponse { error, status }
     }
 }
@@ -235,7 +235,7 @@ impl<'r, 'o: 'r> Responder<'r, 'o> for ErrorResponse {
 }
 
 #[derive(Debug)]
-pub enum NodeStatusApiError {
+pub enum ValidatorApiStorageError {
     MixnodeReportNotFound(String),
     GatewayReportNotFound(String),
     MixnodeUptimeHistoryNotFound(String),
@@ -245,30 +245,30 @@ pub enum NodeStatusApiError {
     InternalDatabaseError,
 }
 
-impl Display for NodeStatusApiError {
+impl Display for ValidatorApiStorageError {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self {
-            NodeStatusApiError::MixnodeReportNotFound(identity) => write!(
+            ValidatorApiStorageError::MixnodeReportNotFound(identity) => write!(
                 f,
                 "Could not find status report associated with mixnode {}",
                 identity
             ),
-            NodeStatusApiError::GatewayReportNotFound(identity) => write!(
+            ValidatorApiStorageError::GatewayReportNotFound(identity) => write!(
                 f,
                 "Could not find status report associated with gateway {}",
                 identity
             ),
-            NodeStatusApiError::MixnodeUptimeHistoryNotFound(identity) => write!(
+            ValidatorApiStorageError::MixnodeUptimeHistoryNotFound(identity) => write!(
                 f,
                 "Could not find uptime history associated with mixnode {}",
                 identity
             ),
-            NodeStatusApiError::GatewayUptimeHistoryNotFound(identity) => write!(
+            ValidatorApiStorageError::GatewayUptimeHistoryNotFound(identity) => write!(
                 f,
                 "Could not find uptime history associated with gateway {}",
                 identity
             ),
-            NodeStatusApiError::InternalDatabaseError => {
+            ValidatorApiStorageError::InternalDatabaseError => {
                 write!(f, "The internal database has experienced an issue")
             }
         }
diff --git a/validator-api/src/node_status_api/routes.rs b/validator-api/src/node_status_api/routes.rs
index e32f4fba75..756f10a9a2 100644
--- a/validator-api/src/node_status_api/routes.rs
+++ b/validator-api/src/node_status_api/routes.rs
@@ -5,14 +5,14 @@ use crate::node_status_api::models::{
     ErrorResponse, GatewayStatusReport, GatewayUptimeHistory, MixnodeStatusReport,
     MixnodeUptimeHistory,
 };
-use crate::storage::NodeStatusStorage;
+use crate::storage::ValidatorApiStorage;
 use rocket::http::Status;
 use rocket::serde::json::Json;
 use rocket::State;
 
 #[get("/mixnode/<pubkey>/report")]
 pub(crate) async fn mixnode_report(
-    storage: &State<NodeStatusStorage>,
+    storage: &State<ValidatorApiStorage>,
     pubkey: &str,
 ) -> Result<Json<MixnodeStatusReport>, ErrorResponse> {
     storage
@@ -24,7 +24,7 @@ pub(crate) async fn mixnode_report(
 
 #[get("/gateway/<pubkey>/report")]
 pub(crate) async fn gateway_report(
-    storage: &State<NodeStatusStorage>,
+    storage: &State<ValidatorApiStorage>,
     pubkey: &str,
 ) -> Result<Json<GatewayStatusReport>, ErrorResponse> {
     storage
@@ -36,7 +36,7 @@ pub(crate) async fn gateway_report(
 
 #[get("/mixnode/<pubkey>/history")]
 pub(crate) async fn mixnode_uptime_history(
-    storage: &State<NodeStatusStorage>,
+    storage: &State<ValidatorApiStorage>,
     pubkey: &str,
 ) -> Result<Json<MixnodeUptimeHistory>, ErrorResponse> {
     storage
@@ -48,7 +48,7 @@ pub(crate) async fn mixnode_uptime_history(
 
 #[get("/gateway/<pubkey>/history")]
 pub(crate) async fn gateway_uptime_history(
-    storage: &State<NodeStatusStorage>,
+    storage: &State<ValidatorApiStorage>,
     pubkey: &str,
 ) -> Result<Json<GatewayUptimeHistory>, ErrorResponse> {
     storage
diff --git a/validator-api/src/node_status_api/uptime_updater.rs b/validator-api/src/node_status_api/uptime_updater.rs
new file mode 100644
index 0000000000..417a9a30b2
--- /dev/null
+++ b/validator-api/src/node_status_api/uptime_updater.rs
@@ -0,0 +1,85 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::node_status_api::models::{
+    GatewayStatusReport, MixnodeStatusReport, ValidatorApiStorageError,
+};
+use crate::node_status_api::ONE_DAY;
+use crate::storage::ValidatorApiStorage;
+use log::error;
+use time::OffsetDateTime;
+use tokio::time::sleep;
+
+pub(crate) struct HistoricalUptimeUpdater {
+    storage: ValidatorApiStorage,
+}
+
+impl HistoricalUptimeUpdater {
+    pub(crate) fn new(storage: ValidatorApiStorage) -> Self {
+        HistoricalUptimeUpdater { storage }
+    }
+
+    /// Obtains the lists of all mixnodes and gateways that were tested at least a single time
+    /// in the last 24h interval.
+    ///
+    /// # Arguments
+    ///
+    /// * `now`: current time.
+    async fn get_active_nodes(
+        &self,
+        now: OffsetDateTime,
+    ) -> Result<(Vec<MixnodeStatusReport>, Vec<GatewayStatusReport>), ValidatorApiStorageError>
+    {
+        let day_ago = (now - ONE_DAY).unix_timestamp();
+        let active_mixnodes = self
+            .storage
+            .get_all_active_mixnode_reports_in_interval(day_ago, now.unix_timestamp())
+            .await?;
+
+        let active_gateways = self
+            .storage
+            .get_all_active_gateway_reports_in_interval(day_ago, now.unix_timestamp())
+            .await?;
+
+        Ok((active_mixnodes, active_gateways))
+    }
+
+    async fn update_uptimes(&self) -> Result<(), ValidatorApiStorageError> {
+        let now = OffsetDateTime::now_utc();
+        let today_iso_8601 = now.date().to_string();
+
+        // get nodes that were active in last 24h
+        let (active_mixnodes, active_gateways) = self.get_active_nodes(now).await?;
+
+        if self
+            .storage
+            .check_if_historical_uptimes_exist_for_date(&today_iso_8601)
+            .await?
+        {
+            warn!("We have already updated uptimes for all nodes this day.")
+        } else {
+            info!("Updating historical daily uptimes of all nodes...");
+            self.storage
+                .update_historical_uptimes(&today_iso_8601, &active_mixnodes, &active_gateways)
+                .await?;
+        }
+
+        Ok(())
+    }
+
+    pub(crate) async fn run(&self) {
+        loop {
+            // start any updates a day after starting the task so that we would have complete data
+            sleep(ONE_DAY).await;
+            if let Err(err) = self.update_uptimes().await {
+                // normally that would have been a warning rather than an error,
+                // however, in this case it implies some underlying issues with our database
+                // that might affect the entire program
+                error!(
+                    "We failed to update daily uptimes of active nodes - {}",
+                    err
+                )
+            }
+        }
+    }
+}
diff --git a/validator-api/src/nymd_client.rs b/validator-api/src/nymd_client.rs
index 1a449abb8d..38dbd1e488 100644
--- a/validator-api/src/nymd_client.rs
+++ b/validator-api/src/nymd_client.rs
@@ -3,8 +3,7 @@
 
 use crate::config::Config;
 use crate::rewarding::{
-    error::RewardingError, GatewayToReward, MixnodeToReward, GATEWAY_REWARD_OP_BASE_GAS_LIMIT,
-    MIXNODE_REWARD_OP_BASE_GAS_LIMIT, PER_GATEWAY_DELEGATION_GAS_INCREASE,
+    error::RewardingError, MixnodeToReward, MIXNODE_REWARD_OP_BASE_GAS_LIMIT,
     PER_MIXNODE_DELEGATION_GAS_INCREASE, REWARDING_GAS_LIMIT_MULTIPLIER,
 };
 use config::defaults::DEFAULT_VALIDATOR_API_PORT;
@@ -129,20 +128,6 @@ impl<C> Client<C> {
             .await
     }
 
-    pub(crate) async fn get_gateway_delegations(
-        &self,
-        identity: IdentityKey,
-    ) -> Result<Vec<Delegation>, ValidatorClientError>
-    where
-        C: CosmWasmClient + Sync,
-    {
-        self.0
-            .read()
-            .await
-            .get_all_nymd_single_gateway_delegations(identity)
-            .await
-    }
-
     async fn estimate_mixnode_reward_fees(&self, nodes: usize, total_delegations: usize) -> Fee {
         let base_gas_limit = MIXNODE_REWARD_OP_BASE_GAS_LIMIT * nodes as u64
             + PER_MIXNODE_DELEGATION_GAS_INCREASE * total_delegations as u64;
@@ -156,19 +141,6 @@ impl<C> Client<C> {
             .calculate_custom_fee(total_gas_limit)
     }
 
-    async fn estimate_gateway_reward_fees(&self, nodes: usize, total_delegations: usize) -> Fee {
-        let base_gas_limit = GATEWAY_REWARD_OP_BASE_GAS_LIMIT * nodes as u64
-            + PER_GATEWAY_DELEGATION_GAS_INCREASE * total_delegations as u64;
-
-        let total_gas_limit = (base_gas_limit as f64 * REWARDING_GAS_LIMIT_MULTIPLIER) as u64;
-
-        self.0
-            .read()
-            .await
-            .nymd
-            .calculate_custom_fee(total_gas_limit)
-    }
-
     pub(crate) async fn reward_mixnodes(
         &self,
         nodes: &[MixnodeToReward],
@@ -213,75 +185,7 @@ impl<C> Client<C> {
         match res {
             Ok(_) => Ok(()),
             Err(err) => {
-                if err.is_tendermint_timeout() {
-                    // wait until we're sure we're into the next block (remember we're holding the lock)
-                    sleep(Duration::from_secs(11)).await;
-                    let curr_sequence = client_guard.nymd.account_sequence().await?;
-                    if curr_sequence.sequence > pre_sequence.sequence {
-                        // unless somebody was messing around doing stuff manually in that tiny time interval
-                        // we're good. It was a false negative.
-                        Ok(())
-                    } else {
-                        // the sequence number has not increased, meaning the transaction was not executed
-                        // so attempt to send it again
-                        client_guard
-                            .nymd
-                            .execute_multiple(&contract, msgs, fee, memo)
-                            .await?;
-                        Ok(())
-                    }
-                } else {
-                    Err(err.into())
-                }
-            }
-        }
-    }
-
-    pub(crate) async fn reward_gateways(
-        &self,
-        nodes: &[GatewayToReward],
-    ) -> Result<(), RewardingError>
-    where
-        C: SigningCosmWasmClient + Sync,
-    {
-        let total_delegations = nodes.iter().map(|node| node.total_delegations).sum();
-        let fee = self
-            .estimate_gateway_reward_fees(nodes.len(), total_delegations)
-            .await;
-        let msgs: Vec<(ExecuteMsg, _)> = nodes
-            .iter()
-            .map(Into::into)
-            .zip(std::iter::repeat(Vec::new()))
-            .collect();
-
-        let memo = format!("rewarding {} gateways", msgs.len());
-
-        let contract = self
-            .0
-            .read()
-            .await
-            .get_mixnet_contract_address()
-            .ok_or(RewardingError::UnspecifiedContractAddress)?;
-
-        // grab the write lock here so we're sure nothing else is executing anything on the contract
-        // in the meantime
-        // however, we're not 100% guarded against everything
-        // for example somebody might have taken the mnemonic used by the validator
-        // and sent a transaction manually using the same account. The sequence number
-        // would have gotten incremented, yet the rewarding transaction might have actually not
-        // been included in the block. sadly we can't do much about that.
-        let client_guard = self.0.write().await;
-        let pre_sequence = client_guard.nymd.account_sequence().await?;
-
-        let res = client_guard
-            .nymd
-            .execute_multiple(&contract, msgs.clone(), fee.clone(), memo.clone())
-            .await;
-
-        match res {
-            Ok(_) => Ok(()),
-            Err(err) => {
-                if err.is_tendermint_timeout() {
+                if err.is_tendermint_response_timeout() {
                     // wait until we're sure we're into the next block (remember we're holding the lock)
                     sleep(Duration::from_secs(11)).await;
                     let curr_sequence = client_guard.nymd.account_sequence().await?;
diff --git a/validator-api/src/rewarding/error.rs b/validator-api/src/rewarding/error.rs
index ea8597dc81..347fa07ad6 100644
--- a/validator-api/src/rewarding/error.rs
+++ b/validator-api/src/rewarding/error.rs
@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::node_status_api::models::NodeStatusApiError;
+use crate::node_status_api::models::ValidatorApiStorageError;
 use thiserror::Error;
 use validator_client::nymd::error::NymdError;
 use validator_client::ValidatorClientError;
@@ -14,15 +14,12 @@ pub(crate) enum RewardingError {
     #[error("There were no mixnodes to reward (network is dead)")]
     NoMixnodesToReward,
 
-    #[error("There were no gateways to reward (network is dead)")]
-    NoGatewaysToReward,
-
     #[error("Failed to execute the smart contract - {0}")]
     ContractExecutionFailure(NymdError),
 
     // The inner error should be modified at some point...
     #[error("We run into storage issues - {0}")]
-    StorageError(NodeStatusApiError),
+    StorageError(ValidatorApiStorageError),
 
     #[error("Failed to query the smart contract - {0}")]
     ValidatorClientError(ValidatorClientError),
@@ -34,8 +31,8 @@ impl From<NymdError> for RewardingError {
     }
 }
 
-impl From<NodeStatusApiError> for RewardingError {
-    fn from(err: NodeStatusApiError) -> Self {
+impl From<ValidatorApiStorageError> for RewardingError {
+    fn from(err: ValidatorApiStorageError) -> Self {
         RewardingError::StorageError(err)
     }
 }
@@ -50,7 +47,7 @@ impl RewardingError {
     pub fn is_tendermint_duplicate(&self) -> bool {
         match &self {
             RewardingError::ValidatorClientError(ValidatorClientError::NymdError(nymd_err)) => {
-                nymd_err.is_tendermint_duplicate()
+                nymd_err.is_tendermint_response_duplicate()
             }
             _ => false,
         }
diff --git a/validator-api/src/rewarding/mod.rs b/validator-api/src/rewarding/mod.rs
index 09d56eada3..81d6aaacae 100644
--- a/validator-api/src/rewarding/mod.rs
+++ b/validator-api/src/rewarding/mod.rs
@@ -2,19 +2,17 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::cache::ValidatorCache;
-use crate::node_status_api::models::{GatewayStatusReport, MixnodeStatusReport, Uptime};
+use crate::node_status_api::models::{MixnodeStatusReport, Uptime};
 use crate::node_status_api::ONE_DAY;
 use crate::nymd_client::Client;
 use crate::rewarding::epoch::Epoch;
 use crate::rewarding::error::RewardingError;
 use crate::storage::models::{
-    FailedGatewayRewardChunk, FailedMixnodeRewardChunk, PossiblyUnrewardedGateway,
-    PossiblyUnrewardedMixnode, RewardingReport,
+    FailedMixnodeRewardChunk, PossiblyUnrewardedMixnode, RewardingReport,
 };
-use crate::storage::NodeStatusStorage;
+use crate::storage::ValidatorApiStorage;
 use log::{error, info};
 use mixnet_contract::{ExecuteMsg, IdentityKey};
-use rand::{thread_rng, Rng};
 use std::collections::HashMap;
 use std::convert::{TryFrom, TryInto};
 use std::time::Duration;
@@ -28,7 +26,6 @@ pub(crate) mod error;
 // the actual base cost is around 125_000, but let's give ourselves a bit of safety net in case
 // we introduce some tiny contract changes that would bump that value up
 pub(crate) const MIXNODE_REWARD_OP_BASE_GAS_LIMIT: u64 = 150_000;
-pub(crate) const GATEWAY_REWARD_OP_BASE_GAS_LIMIT: u64 = 150_000;
 
 // For each delegation reward we perform a read and a write is being executed,
 // which are the most costly parts involved in process. Both of them are ~1000 sdk gas in cost.
@@ -37,7 +34,6 @@ pub(crate) const GATEWAY_REWARD_OP_BASE_GAS_LIMIT: u64 = 150_000;
 // Therefore, since base cost is not tuned to the bare minimum, let's treat all of delegations as extra
 // 2750 of sdk gas.
 pub(crate) const PER_MIXNODE_DELEGATION_GAS_INCREASE: u64 = 2750;
-pub(crate) const PER_GATEWAY_DELEGATION_GAS_INCREASE: u64 = 2750;
 
 // Another safety net in case of contract changes,
 // the calculated total gas limit is going to get multiplied by that value.
@@ -45,8 +41,6 @@ pub(crate) const REWARDING_GAS_LIMIT_MULTIPLIER: f64 = 1.05;
 
 pub(crate) const MAX_TO_REWARD_AT_ONCE: usize = 50;
 
-pub(crate) const REWARDING_TIME_VARIANCE: f32 = 0.05; // 5% (so for example +/-1.2h for 24h epoch)
-
 #[derive(Debug, Clone)]
 pub(crate) struct MixnodeToReward {
     pub(crate) identity: IdentityKey,
@@ -56,29 +50,14 @@ pub(crate) struct MixnodeToReward {
     pub(crate) total_delegations: usize,
 }
 
-#[derive(Debug, Clone)]
-pub(crate) struct GatewayToReward {
-    pub(crate) identity: IdentityKey,
-    pub(crate) uptime: Uptime,
-
-    /// Total number of individual addresses that have delegated to this particular gateway
-    pub(crate) total_delegations: usize,
-}
-
 pub(crate) struct FailedMixnodeRewardChunkDetails {
     possibly_unrewarded: Vec<MixnodeToReward>,
     error_message: String,
 }
 
-pub(crate) struct FailedGatewayRewardChunkDetails {
-    possibly_unrewarded: Vec<GatewayToReward>,
-    error_message: String,
-}
-
 #[derive(Default)]
 pub(crate) struct FailureData {
     mixnodes: Option<Vec<FailedMixnodeRewardChunkDetails>>,
-    gateways: Option<Vec<FailedGatewayRewardChunkDetails>>,
 }
 
 impl<'a> From<&'a MixnodeToReward> for ExecuteMsg {
@@ -90,19 +69,10 @@ impl<'a> From<&'a MixnodeToReward> for ExecuteMsg {
     }
 }
 
-impl<'a> From<&'a GatewayToReward> for ExecuteMsg {
-    fn from(node: &GatewayToReward) -> Self {
-        ExecuteMsg::RewardGateway {
-            identity: node.identity.clone(),
-            uptime: node.uptime.u8() as u32,
-        }
-    }
-}
-
 pub(crate) struct Rewarder {
     nymd_client: Client<SigningNymdClient>,
     validator_cache: ValidatorCache,
-    storage: NodeStatusStorage,
+    storage: ValidatorApiStorage,
 
     /// The first epoch of the current length.
     first_epoch: Epoch,
@@ -121,7 +91,7 @@ impl Rewarder {
     pub(crate) fn new(
         nymd_client: Client<SigningNymdClient>,
         validator_cache: ValidatorCache,
-        storage: NodeStatusStorage,
+        storage: ValidatorApiStorage,
         first_epoch: Epoch,
         expected_epoch_monitor_runs: usize,
         minimum_epoch_monitor_threshold: u8,
@@ -152,22 +122,6 @@ impl Rewarder {
             .len())
     }
 
-    /// Obtains the current number of delegators that have delegated their stake towards this particular gateway.
-    ///
-    /// # Arguments
-    ///
-    /// * `identity`: identity key of the gateway
-    async fn get_gateway_delegators_count(
-        &self,
-        identity: IdentityKey,
-    ) -> Result<usize, RewardingError> {
-        Ok(self
-            .nymd_client
-            .get_gateway_delegations(identity)
-            .await?
-            .len())
-    }
-
     /// Queries the smart contract in order to obtain the current list of bonded mixnodes and then
     /// for each mixnode determines how many delegators it has.
     async fn produce_active_mixnode_delegators_map(
@@ -205,30 +159,6 @@ impl Rewarder {
         Ok(map)
     }
 
-    /// Queries the smart contract in order to obtain the current list of bonded gateways and then
-    /// for each gateway determines how many delegators it has.
-    async fn produce_active_gateway_delegators_map(
-        &self,
-    ) -> Result<HashMap<IdentityKey, usize>, RewardingError> {
-        // look at comments in `produce_mixnode_delegators_map` for some optimisation elaboration
-        let mut map = HashMap::new();
-
-        let active_bonded_gateways = self
-            .validator_cache
-            .active_gateways()
-            .await
-            .ok_or(RewardingError::NoGatewaysToReward)?
-            .into_inner();
-        for gateway in active_bonded_gateways.into_iter() {
-            let delegator_count = self
-                .get_gateway_delegators_count(gateway.gateway.identity_key.clone())
-                .await?;
-            map.insert(gateway.gateway.identity_key, delegator_count);
-        }
-
-        Ok(map)
-    }
-
     /// Calculates the absolute uptime of given node that is then passed as one of the arguments
     /// in the smart contract to determine the actual reward value.
     ///
@@ -293,73 +223,23 @@ impl Rewarder {
         Ok(eligible_nodes)
     }
 
-    /// Given the list of gateways that were tested in the last epoch, tries to determine the
-    /// subset that are eligible for any rewards.
-    ///
-    /// As of right now, it is a rather straightforward process. It is checked whether the node
-    /// is currently bonded, has uptime > 0 and is part of the "active" set.
-    /// Unlike the typescript rewards script, it currently does not look at the non-mixing ports are open.
-    ///
-    /// The method also obtains the number of delegators towards the node in order to more accurately
-    /// approximate the required gas fees when distributing the rewards.
-    ///
-    /// # Arguments
-    ///
-    /// * `active_gateways`: list of the nodes that were tested at least once by the network monitor
-    ///                      in the last epoch.
-    async fn determine_eligible_gateways(
-        &self,
-        active_gateways: &[GatewayStatusReport],
-    ) -> Result<Vec<GatewayToReward>, RewardingError> {
-        let gateway_delegators = self.produce_active_gateway_delegators_map().await?;
-
-        let eligible_nodes = active_gateways
-            .iter()
-            .filter_map(|gateway| {
-                gateway_delegators
-                    .get(&gateway.identity)
-                    .map(|&total_delegations| GatewayToReward {
-                        identity: gateway.identity.clone(),
-                        uptime: self.calculate_absolute_uptime(
-                            gateway.last_day_ipv4,
-                            gateway.last_day_ipv6,
-                        ),
-                        total_delegations,
-                    })
-            })
-            .filter(|node| node.uptime.u8() > 0)
-            .collect();
-
-        Ok(eligible_nodes)
-    }
-
-    /// Obtains the lists of all mixnodes and gateways that were tested at least a single time
+    /// Obtains the lists of all mixnodes that were tested at least a single time
     /// by the network monitor in the specified epoch.
     ///
     /// # Arguments
     ///
     /// * `epoch`: the specified epoch.
-    async fn get_active_monitor_nodes(
+    async fn get_active_monitor_mixnodes(
         &self,
         epoch: Epoch,
-    ) -> Result<(Vec<MixnodeStatusReport>, Vec<GatewayStatusReport>), RewardingError> {
-        let active_mixnodes = self
+    ) -> Result<Vec<MixnodeStatusReport>, RewardingError> {
+        Ok(self
             .storage
             .get_all_active_mixnode_reports_in_interval(
                 epoch.start_unix_timestamp(),
                 epoch.end_unix_timestamp(),
             )
-            .await?;
-
-        let active_gateways = self
-            .storage
-            .get_all_active_gateway_reports_in_interval(
-                epoch.start_unix_timestamp(),
-                epoch.end_unix_timestamp(),
-            )
-            .await?;
-
-        Ok((active_mixnodes, active_gateways))
+            .await?)
     }
 
     /// Using the list of mixnodes eligible for rewards, chunks it into pre-defined sized-chunks
@@ -413,58 +293,6 @@ impl Rewarder {
         }
     }
 
-    /// Using the list of gateways eligible for rewards, chunks it into pre-defined sized-chunks
-    /// and gives out the rewards by calling the smart contract.
-    ///
-    /// Returns an optional vector containing list of chunks that experienced a smart contract
-    /// execution error during reward distribution. However, it does not necessarily imply they
-    /// were not rewarded. There are some edge cases where we time out waiting for block to be included
-    /// yet the transactions went through.
-    ///
-    /// Only returns errors for problems originating from before smart contract was called, i.e.
-    /// we know for sure not a single node has been rewarded.
-    ///
-    /// # Arguments
-    ///
-    /// * `eligible_gateways`: list of the nodes that are eligible to receive non-zero rewards.
-    async fn distribute_rewards_to_gateways(
-        &self,
-        eligible_gateways: &[GatewayToReward],
-    ) -> Option<Vec<FailedGatewayRewardChunkDetails>> {
-        let mut failed_chunks = Vec::new();
-
-        for (i, gateway_chunk) in eligible_gateways.chunks(MAX_TO_REWARD_AT_ONCE).enumerate() {
-            if let Err(err) = self.nymd_client.reward_gateways(gateway_chunk).await {
-                // this is a super weird edge case that we didn't catch change to sequence and
-                // resent rewards unnecessarily, but the mempool saved us from executing it again
-                // however, still we want to wait until we're sure we're into the next block
-                if !err.is_tendermint_duplicate() {
-                    error!("failed to reward gateways... - {}", err);
-                    failed_chunks.push(FailedGatewayRewardChunkDetails {
-                        possibly_unrewarded: gateway_chunk.to_vec(),
-                        error_message: err.to_string(),
-                    });
-                }
-                sleep(Duration::from_secs(11)).await;
-            }
-
-            let rewarded = i * MAX_TO_REWARD_AT_ONCE + gateway_chunk.len();
-            let percentage = rewarded as f32 * 100.0 / eligible_gateways.len() as f32;
-            info!(
-                "Rewarded {} / {} gateways\t{:.2}%",
-                rewarded,
-                eligible_gateways.len(),
-                percentage
-            );
-        }
-
-        if failed_chunks.is_empty() {
-            None
-        } else {
-            Some(failed_chunks)
-        }
-    }
-
     /// Using the list of active mixnode and gateways, determine which of them are eligible for
     /// rewarding and distribute the rewards.
     ///
@@ -474,14 +302,10 @@ impl Rewarder {
     ///
     /// * `active_monitor_mixnodes`: list of the nodes that were tested at least once by the network monitor
     ///                              in the last epoch.
-    ///
-    /// * `active_monitor_gateways`: list of the nodes that were tested at least once by the network monitor
-    ///                              in the last epoch.
     async fn distribute_rewards(
         &self,
         epoch_rewarding_id: i64,
         active_monitor_mixnodes: &[MixnodeStatusReport],
-        active_monitor_gateways: &[GatewayStatusReport],
     ) -> Result<(RewardingReport, Option<FailureData>), RewardingError> {
         let mut failure_data = FailureData::default();
 
@@ -492,25 +316,13 @@ impl Rewarder {
             return Err(RewardingError::NoMixnodesToReward);
         }
 
-        let eligible_gateways = self
-            .determine_eligible_gateways(active_monitor_gateways)
-            .await?;
-        if eligible_gateways.is_empty() {
-            return Err(RewardingError::NoGatewaysToReward);
-        }
-
         failure_data.mixnodes = self
             .distribute_rewards_to_mixnodes(&eligible_mixnodes)
             .await;
 
-        failure_data.gateways = self
-            .distribute_rewards_to_gateways(&eligible_gateways)
-            .await;
-
         let report = RewardingReport {
             epoch_rewarding_id,
             eligible_mixnodes: eligible_mixnodes.len() as i64,
-            eligible_gateways: eligible_gateways.len() as i64,
             possibly_unrewarded_mixnodes: failure_data
                 .mixnodes
                 .as_ref()
@@ -521,19 +333,9 @@ impl Rewarder {
                         .sum::<usize>() as i64
                 })
                 .unwrap_or_default(),
-            possibly_unrewarded_gateways: failure_data
-                .gateways
-                .as_ref()
-                .map(|chunks| {
-                    chunks
-                        .iter()
-                        .map(|chunk| chunk.possibly_unrewarded.len())
-                        .sum::<usize>() as i64
-                })
-                .unwrap_or_default(),
         };
 
-        if failure_data.mixnodes.is_none() && failure_data.gateways.is_none() {
+        if failure_data.mixnodes.is_none() {
             Ok((report, None))
         } else {
             Ok((report, Some(failure_data)))
@@ -578,46 +380,9 @@ impl Rewarder {
             }
         }
 
-        if let Some(failed_gateway_chunks) = failure_data.gateways {
-            for failed_chunk in failed_gateway_chunks.into_iter() {
-                // save the chunk
-                let chunk_id = self
-                    .storage
-                    .insert_failed_gateway_reward_chunk(FailedGatewayRewardChunk {
-                        epoch_rewarding_id,
-                        error_message: failed_chunk.error_message,
-                    })
-                    .await?;
-
-                // and then all associated nodes
-                for node in failed_chunk.possibly_unrewarded.into_iter() {
-                    self.storage
-                        .insert_possibly_unrewarded_gateway(PossiblyUnrewardedGateway {
-                            chunk_id,
-                            identity: node.identity,
-                            uptime: node.uptime.u8(),
-                        })
-                        .await?;
-                }
-            }
-        }
-
         Ok(())
     }
 
-    /// Determines random positive or negative time variance that should be added to the rewarding
-    /// distribution time so that all validators would not attempt to hit the smart contract
-    /// at exactly the same time.
-    fn epoch_variance(&self) -> (bool, Duration) {
-        let mut rng = thread_rng();
-
-        let abs_variance_secs = REWARDING_TIME_VARIANCE * self.first_epoch.length().as_secs_f32();
-        let variance = Duration::from_secs(rng.gen_range(0, abs_variance_secs as u64));
-        let sign = rng.gen_bool(0.5);
-
-        (sign, variance)
-    }
-
     /// Determines whether this validator has already distributed rewards for the specified epoch
     /// so that it wouldn't accidentally attempt to do it again.
     ///
@@ -707,9 +472,7 @@ impl Rewarder {
         Ok(current_epoch.next_epoch())
     }
 
-    /// Given datetime of the rewarding epoch datetime, determine time until it ends and add (or remove)
-    /// a little bit of time variance from it in order to prevent all validators distributing
-    /// the rewards at exactly the same time instant.
+    /// Given datetime of the rewarding epoch datetime, determine duration until it ends.
     ///
     /// # Arguments
     ///
@@ -723,13 +486,7 @@ impl Rewarder {
         // we have a positive duration so we can't fail the conversion
         let until_epoch_end: Duration = (rewarding_epoch.end() - now).try_into().unwrap();
 
-        // add a bit of variance to the start time
-        let (sign, variance) = self.epoch_variance();
-        if sign {
-            Some(until_epoch_end + variance)
-        } else {
-            until_epoch_end.checked_sub(variance)
-        }
+        Some(until_epoch_end)
     }
 
     /// Distribute rewards to all eligible mixnodes and gateways on the network.
@@ -744,8 +501,7 @@ impl Rewarder {
         );
 
         // get nodes that were active during the epoch
-        let (active_monitor_mixnodes, active_monitor_gateways) =
-            self.get_active_monitor_nodes(epoch).await?;
+        let active_monitor_mixnodes = self.get_active_monitor_mixnodes(epoch).await?;
 
         // insert information about beginning the procedure (so that if we crash during it,
         // we wouldn't attempt to possibly double reward operators)
@@ -755,11 +511,7 @@ impl Rewarder {
             .await?;
 
         let (report, failure_data) = self
-            .distribute_rewards(
-                epoch_rewarding_id,
-                &active_monitor_mixnodes,
-                &active_monitor_gateways,
-            )
+            .distribute_rewards(epoch_rewarding_id, &active_monitor_mixnodes)
             .await?;
 
         self.storage
@@ -777,32 +529,11 @@ impl Rewarder {
             }
         }
 
-        // TODO: again, this assumes 24h epochs.
-        let epoch_iso_8601 = epoch.start().date().to_string();
-        let two_days_ago = (epoch.start() - 2 * ONE_DAY).unix_timestamp();
-
-        // NOTE: this works under assumption that epochs are 24h in length.
-        // If this changes then the historical uptime updates should be performed
-        // on a timer in another task
-        if self
-            .storage
-            .check_if_historical_uptimes_exist_for_date(&epoch_iso_8601)
-            .await?
-        {
-            error!("We have already updated uptimes for all nodes this day. If you're seeing this warning, it's likely rewards were given out twice this day!")
-        } else {
-            info!(
-                "Updating historical daily uptimes of all nodes and purging old status reports..."
-            );
-            self.storage
-                .update_historical_uptimes(
-                    &epoch_iso_8601,
-                    &active_monitor_mixnodes,
-                    &active_monitor_gateways,
-                )
-                .await?;
-            self.storage.purge_old_statuses(two_days_ago).await?;
-        }
+        // since we have already performed rewards, purge everything older than the end of this epoch
+        // (+one day of buffer) as we're never going to need it again (famous last words...)
+        // note that usually end of epoch is equal to the current time
+        let cutoff = (epoch.end() - ONE_DAY).unix_timestamp();
+        self.storage.purge_old_statuses(cutoff).await?;
 
         Ok(())
     }
@@ -866,7 +597,6 @@ impl Rewarder {
 
             // wait's until the start of the *next* epoch, e.g. end of the current chosen epoch
             // (it could be none, for example if we are distributing overdue rewards for the previous epoch)
-            // plus add a bit of variance
             if let Some(remaining_time) =
                 self.determine_delay_until_next_rewarding(next_rewarding_epoch)
             {
diff --git a/validator-api/src/storage/manager.rs b/validator-api/src/storage/manager.rs
index 28758f3594..a31816f45e 100644
--- a/validator-api/src/storage/manager.rs
+++ b/validator-api/src/storage/manager.rs
@@ -5,8 +5,8 @@ use crate::network_monitor::monitor::summary_producer::NodeResult;
 use crate::node_status_api::models::{HistoricalUptime, Uptime};
 use crate::node_status_api::utils::ActiveNodeDayStatuses;
 use crate::storage::models::{
-    ActiveNode, EpochRewarding, FailedGatewayRewardChunk, FailedMixnodeRewardChunk, NodeStatus,
-    PossiblyUnrewardedGateway, PossiblyUnrewardedMixnode, RewardingReport,
+    ActiveNode, EpochRewarding, FailedMixnodeRewardChunk, NodeStatus, PossiblyUnrewardedMixnode,
+    RewardingReport,
 };
 use crate::storage::UnixTimestamp;
 use std::convert::TryFrom;
@@ -791,17 +791,15 @@ impl StorageManager {
         sqlx::query!(
             r#"
                 INSERT INTO rewarding_report
-                (epoch_rewarding_id, eligible_mixnodes, eligible_gateways, possibly_unrewarded_mixnodes, possibly_unrewarded_gateways)
-                VALUES (?, ?, ?, ?, ?);
+                (epoch_rewarding_id, eligible_mixnodes, possibly_unrewarded_mixnodes)
+                VALUES (?, ?, ?);
             "#,
             report.epoch_rewarding_id,
             report.eligible_mixnodes,
-            report.eligible_gateways,
             report.possibly_unrewarded_mixnodes,
-            report.possibly_unrewarded_gateways,
         )
-            .execute(&self.connection_pool)
-            .await?;
+        .execute(&self.connection_pool)
+        .await?;
         Ok(())
     }
 
@@ -826,27 +824,6 @@ impl StorageManager {
         Ok(res.last_insert_rowid())
     }
 
-    /// Inserts new failed gateway reward chunk information into the database.
-    /// Returns id of the newly created entry.
-    ///
-    /// # Arguments
-    ///
-    /// * `failed_chunk`: chunk information to insert.
-    pub(super) async fn insert_failed_gateway_reward_chunk(
-        &self,
-        failed_chunk: FailedGatewayRewardChunk,
-    ) -> Result<i64, sqlx::Error> {
-        let res = sqlx::query!(
-            r#"
-                INSERT INTO failed_gateway_reward_chunk (error_message, reward_summary_id) VALUES (?, ?)
-            "#,
-            failed_chunk.error_message,
-            failed_chunk.epoch_rewarding_id,
-        ).execute(&self.connection_pool).await?;
-
-        Ok(res.last_insert_rowid())
-    }
-
     /// Inserts information into the database about a mixnode that might have been unfairly unrewarded this epoch.
     ///
     /// # Arguments
@@ -867,26 +844,6 @@ impl StorageManager {
         Ok(())
     }
 
-    /// Inserts information into the database about a gateway that might have been unfairly unrewarded this epoch.
-    ///
-    /// # Arguments
-    ///
-    /// * `gateway`: mixnode information to insert.
-    pub(super) async fn insert_possibly_unrewarded_gateway(
-        &self,
-        gateway: PossiblyUnrewardedGateway,
-    ) -> Result<(), sqlx::Error> {
-        sqlx::query!(
-            r#"
-                INSERT INTO possibly_unrewarded_gateway (identity, uptime, failed_gateway_reward_chunk_id) VALUES (?, ?, ?)
-            "#,
-            gateway.identity,
-            gateway.uptime,
-            gateway.chunk_id
-        ).execute(&self.connection_pool).await?;
-        Ok(())
-    }
-
     /// Obtains all statuses of active mixnodes from the specified time interval.
     ///
     /// # Arguments
diff --git a/validator-api/src/storage/mod.rs b/validator-api/src/storage/mod.rs
index 64cfac2487..2954af2f35 100644
--- a/validator-api/src/storage/mod.rs
+++ b/validator-api/src/storage/mod.rs
@@ -4,13 +4,13 @@
 use crate::network_monitor::monitor::summary_producer::NodeResult;
 use crate::node_status_api::models::{
     GatewayStatusReport, GatewayUptimeHistory, MixnodeStatusReport, MixnodeUptimeHistory,
-    NodeStatusApiError,
+    ValidatorApiStorageError,
 };
 use crate::node_status_api::{ONE_DAY, ONE_HOUR};
 use crate::storage::manager::StorageManager;
 use crate::storage::models::{
-    EpochRewarding, FailedGatewayRewardChunk, FailedMixnodeRewardChunk, NodeStatus,
-    PossiblyUnrewardedGateway, PossiblyUnrewardedMixnode, RewardingReport,
+    EpochRewarding, FailedMixnodeRewardChunk, NodeStatus, PossiblyUnrewardedMixnode,
+    RewardingReport,
 };
 use rocket::fairing::{self, AdHoc};
 use rocket::{Build, Rocket};
@@ -26,11 +26,11 @@ pub(crate) type UnixTimestamp = i64;
 
 // note that clone here is fine as upon cloning the same underlying pool will be used
 #[derive(Clone)]
-pub(crate) struct NodeStatusStorage {
+pub(crate) struct ValidatorApiStorage {
     manager: StorageManager,
 }
 
-impl NodeStatusStorage {
+impl ValidatorApiStorage {
     async fn init(rocket: Rocket<Build>, database_path: PathBuf) -> fairing::Result {
         // TODO: we can inject here more stuff based on our validator-api global config
         // struct. Maybe different pool size or timeout intervals?
@@ -57,7 +57,7 @@ impl NodeStatusStorage {
 
         info!("Database migration finished!");
 
-        let storage = NodeStatusStorage {
+        let storage = ValidatorApiStorage {
             manager: StorageManager { connection_pool },
         };
 
@@ -66,7 +66,7 @@ impl NodeStatusStorage {
 
     pub(crate) fn stage(database_path: PathBuf) -> AdHoc {
         AdHoc::try_on_ignite("SQLx Database", |rocket| {
-            NodeStatusStorage::init(rocket, database_path)
+            ValidatorApiStorage::init(rocket, database_path)
         })
     }
 
@@ -83,18 +83,18 @@ impl NodeStatusStorage {
         &self,
         identity: &str,
         since: UnixTimestamp,
-    ) -> Result<(Vec<NodeStatus>, Vec<NodeStatus>), NodeStatusApiError> {
+    ) -> Result<(Vec<NodeStatus>, Vec<NodeStatus>), ValidatorApiStorageError> {
         let ipv4_statuses = self
             .manager
             .get_mixnode_ipv4_statuses_since(identity, since)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)?;
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)?;
 
         let ipv6_statuses = self
             .manager
             .get_mixnode_ipv6_statuses_since(identity, since)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)?;
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)?;
 
         Ok((ipv4_statuses, ipv6_statuses))
     }
@@ -112,18 +112,18 @@ impl NodeStatusStorage {
         &self,
         identity: &str,
         since: UnixTimestamp,
-    ) -> Result<(Vec<NodeStatus>, Vec<NodeStatus>), NodeStatusApiError> {
+    ) -> Result<(Vec<NodeStatus>, Vec<NodeStatus>), ValidatorApiStorageError> {
         let ipv4_statuses = self
             .manager
             .get_gateway_ipv4_statuses_since(identity, since)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)?;
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)?;
 
         let ipv6_statuses = self
             .manager
             .get_gateway_ipv6_statuses_since(identity, since)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)?;
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)?;
 
         Ok((ipv4_statuses, ipv6_statuses))
     }
@@ -132,7 +132,7 @@ impl NodeStatusStorage {
     pub(crate) async fn construct_mixnode_report(
         &self,
         identity: &str,
-    ) -> Result<MixnodeStatusReport, NodeStatusApiError> {
+    ) -> Result<MixnodeStatusReport, ValidatorApiStorageError> {
         let now = OffsetDateTime::now_utc();
         let day_ago = (now - ONE_DAY).unix_timestamp();
         let hour_ago = (now - ONE_HOUR).unix_timestamp();
@@ -141,7 +141,7 @@ impl NodeStatusStorage {
 
         // if we have no statuses, the node doesn't exist (or monitor is down), but either way, we can't make a report
         if ipv4_statuses.is_empty() {
-            return Err(NodeStatusApiError::MixnodeReportNotFound(
+            return Err(ValidatorApiStorageError::MixnodeReportNotFound(
                 identity.to_owned(),
             ));
         }
@@ -168,7 +168,7 @@ impl NodeStatusStorage {
             .manager
             .get_mixnode_owner(identity)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)?
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)?
             .expect("The node doesn't have an owner even though we have status information on it!");
 
         Ok(MixnodeStatusReport::construct_from_last_day_reports(
@@ -185,7 +185,7 @@ impl NodeStatusStorage {
     pub(crate) async fn construct_gateway_report(
         &self,
         identity: &str,
-    ) -> Result<GatewayStatusReport, NodeStatusApiError> {
+    ) -> Result<GatewayStatusReport, ValidatorApiStorageError> {
         let now = OffsetDateTime::now_utc();
         let day_ago = (now - ONE_DAY).unix_timestamp();
         let hour_ago = (now - ONE_HOUR).unix_timestamp();
@@ -194,7 +194,7 @@ impl NodeStatusStorage {
 
         // if we have no statuses, the node doesn't exist (or monitor is down), but either way, we can't make a report
         if ipv4_statuses.is_empty() {
-            return Err(NodeStatusApiError::GatewayReportNotFound(
+            return Err(ValidatorApiStorageError::GatewayReportNotFound(
                 identity.to_owned(),
             ));
         }
@@ -221,7 +221,7 @@ impl NodeStatusStorage {
             .manager
             .get_gateway_owner(identity)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)?
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)?
             .expect(
                 "The gateway doesn't have an owner even though we have status information on it!",
             );
@@ -240,15 +240,15 @@ impl NodeStatusStorage {
     pub(crate) async fn get_mixnode_uptime_history(
         &self,
         identity: &str,
-    ) -> Result<MixnodeUptimeHistory, NodeStatusApiError> {
+    ) -> Result<MixnodeUptimeHistory, ValidatorApiStorageError> {
         let history = self
             .manager
             .get_mixnode_historical_uptimes(identity)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)?;
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)?;
 
         if history.is_empty() {
-            return Err(NodeStatusApiError::MixnodeUptimeHistoryNotFound(
+            return Err(ValidatorApiStorageError::MixnodeUptimeHistoryNotFound(
                 identity.to_owned(),
             ));
         }
@@ -257,7 +257,7 @@ impl NodeStatusStorage {
             .manager
             .get_mixnode_owner(identity)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)?
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)?
             .expect("The node doesn't have an owner even though we have uptime history for it!");
 
         Ok(MixnodeUptimeHistory::new(
@@ -270,15 +270,15 @@ impl NodeStatusStorage {
     pub(crate) async fn get_gateway_uptime_history(
         &self,
         identity: &str,
-    ) -> Result<GatewayUptimeHistory, NodeStatusApiError> {
+    ) -> Result<GatewayUptimeHistory, ValidatorApiStorageError> {
         let history = self
             .manager
             .get_gateway_historical_uptimes(identity)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)?;
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)?;
 
         if history.is_empty() {
-            return Err(NodeStatusApiError::GatewayUptimeHistoryNotFound(
+            return Err(ValidatorApiStorageError::GatewayUptimeHistoryNotFound(
                 identity.to_owned(),
             ));
         }
@@ -287,7 +287,7 @@ impl NodeStatusStorage {
             .manager
             .get_gateway_owner(identity)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)?
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)?
             .expect("The gateway doesn't have an owner even though we have uptime history for it!");
 
         Ok(GatewayUptimeHistory::new(
@@ -309,7 +309,7 @@ impl NodeStatusStorage {
         &self,
         start: UnixTimestamp,
         end: UnixTimestamp,
-    ) -> Result<Vec<MixnodeStatusReport>, NodeStatusApiError> {
+    ) -> Result<Vec<MixnodeStatusReport>, ValidatorApiStorageError> {
         if (end - start) as u64 != ONE_DAY.as_secs() {
             warn!("Our current epoch length breaks the 24h length assumption")
         }
@@ -324,7 +324,7 @@ impl NodeStatusStorage {
             .manager
             .get_all_active_mixnodes_statuses_in_interval(start, end)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)?
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)?
             .into_iter()
             .map(|statuses| {
                 MixnodeStatusReport::construct_from_last_day_reports(
@@ -354,7 +354,7 @@ impl NodeStatusStorage {
         &self,
         start: UnixTimestamp,
         end: UnixTimestamp,
-    ) -> Result<Vec<GatewayStatusReport>, NodeStatusApiError> {
+    ) -> Result<Vec<GatewayStatusReport>, ValidatorApiStorageError> {
         if (end - start) as u64 != ONE_DAY.as_secs() {
             warn!("Our current epoch length breaks the 24h length assumption")
         }
@@ -369,7 +369,7 @@ impl NodeStatusStorage {
             .manager
             .get_all_active_gateways_statuses_in_interval(start, end)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)?
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)?
             .into_iter()
             .map(|statuses| {
                 GatewayStatusReport::construct_from_last_day_reports(
@@ -392,7 +392,7 @@ impl NodeStatusStorage {
         &self,
         mixnode_results: Vec<NodeResult>,
         gateway_results: Vec<NodeResult>,
-    ) -> Result<(), NodeStatusApiError> {
+    ) -> Result<(), ValidatorApiStorageError> {
         info!("Submitting new node results to the database. There are {} mixnode results and {} gateway results", mixnode_results.len(), gateway_results.len());
 
         let now = OffsetDateTime::now_utc().unix_timestamp();
@@ -400,23 +400,23 @@ impl NodeStatusStorage {
         self.manager
             .submit_mixnode_statuses(now, mixnode_results)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)?;
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)?;
 
         self.manager
             .submit_gateway_statuses(now, gateway_results)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)
     }
 
     /// Inserts an entry to the database with the network monitor test run information
     /// that has occurred at this instant.
-    pub(crate) async fn insert_monitor_run(&self) -> Result<(), NodeStatusApiError> {
+    pub(crate) async fn insert_monitor_run(&self) -> Result<(), ValidatorApiStorageError> {
         let now = OffsetDateTime::now_utc().unix_timestamp();
 
         self.manager
             .insert_monitor_run(now)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)
     }
 
     /// Obtains number of network monitor test runs that have occurred within the specified interval.
@@ -429,26 +429,22 @@ impl NodeStatusStorage {
         &self,
         since: UnixTimestamp,
         until: UnixTimestamp,
-    ) -> Result<usize, NodeStatusApiError> {
+    ) -> Result<usize, ValidatorApiStorageError> {
         let run_count = self
             .manager
             .get_monitor_runs_count(since, until)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)?;
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)?;
 
         if run_count < 0 {
             // I don't think it's ever possible for SQL to return a negative value from COUNT?
-            return Err(NodeStatusApiError::InternalDatabaseError);
+            return Err(ValidatorApiStorageError::InternalDatabaseError);
         }
         Ok(run_count as usize)
     }
 
     /// Given lists of reports of all monitor-active mixnodes and gateways, inserts the data into the
-    /// historical uptime tables.
-    ///
-    /// This method is called at every reward cycle. Note that currently to work as expected, it
-    /// assumes a 24h epoch period. If this assumption is broken, this method should be called
-    /// on an independent timer.
+    /// historical uptime tables. This method is called at a 24h timer.
     ///
     /// # Arguments
     ///
@@ -460,7 +456,7 @@ impl NodeStatusStorage {
         today_iso_8601: &str,
         mixnode_reports: &[MixnodeStatusReport],
         gateway_reports: &[GatewayStatusReport],
-    ) -> Result<(), NodeStatusApiError> {
+    ) -> Result<(), ValidatorApiStorageError> {
         for report in mixnode_reports {
             // if this ever fails, we have a super weird error because we just constructed report for that node
             // and we never delete node data!
@@ -468,7 +464,7 @@ impl NodeStatusStorage {
                 .manager
                 .get_mixnode_id(&report.identity)
                 .await
-                .map_err(|_| NodeStatusApiError::InternalDatabaseError)?
+                .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)?
             {
                 Some(node_id) => node_id,
                 None => {
@@ -488,7 +484,7 @@ impl NodeStatusStorage {
                     report.last_day_ipv4.u8(),
                 )
                 .await
-                .map_err(|_| NodeStatusApiError::InternalDatabaseError)?;
+                .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)?;
         }
 
         for report in gateway_reports {
@@ -498,7 +494,7 @@ impl NodeStatusStorage {
                 .manager
                 .get_gateway_id(&report.identity)
                 .await
-                .map_err(|_| NodeStatusApiError::InternalDatabaseError)?
+                .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)?
             {
                 Some(node_id) => node_id,
                 None => {
@@ -518,7 +514,7 @@ impl NodeStatusStorage {
                     report.last_day_ipv4.u8(),
                 )
                 .await
-                .map_err(|_| NodeStatusApiError::InternalDatabaseError)?;
+                .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)?;
         }
 
         Ok(())
@@ -527,11 +523,11 @@ impl NodeStatusStorage {
     pub(crate) async fn check_if_historical_uptimes_exist_for_date(
         &self,
         date_iso_8601: &str,
-    ) -> Result<bool, NodeStatusApiError> {
+    ) -> Result<bool, ValidatorApiStorageError> {
         self.manager
             .check_for_historical_uptime_existence(date_iso_8601)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)
     }
 
     /// Removes all ipv4 and ipv6 statuses for all mixnodes and gateways that are older than the
@@ -543,23 +539,23 @@ impl NodeStatusStorage {
     pub(crate) async fn purge_old_statuses(
         &self,
         until: UnixTimestamp,
-    ) -> Result<(), NodeStatusApiError> {
+    ) -> Result<(), ValidatorApiStorageError> {
         self.manager
             .purge_old_mixnode_ipv4_statuses(until)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)?;
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)?;
         self.manager
             .purge_old_mixnode_ipv6_statuses(until)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)?;
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)?;
         self.manager
             .purge_old_gateway_ipv4_statuses(until)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)?;
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)?;
         self.manager
             .purge_old_gateway_ipv6_statuses(until)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)
     }
 
     ////////////////////////////////////////////////////////////////////////
@@ -575,11 +571,11 @@ impl NodeStatusStorage {
     pub(crate) async fn insert_started_epoch_rewarding(
         &self,
         epoch_timestamp: UnixTimestamp,
-    ) -> Result<i64, NodeStatusApiError> {
+    ) -> Result<i64, ValidatorApiStorageError> {
         self.manager
             .insert_new_epoch_rewarding(epoch_timestamp)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)
     }
 
     // /// Tries to obtain the most recent epoch rewarding entry currently stored.
@@ -604,11 +600,11 @@ impl NodeStatusStorage {
     pub(super) async fn get_epoch_rewarding_entry(
         &self,
         epoch_timestamp: UnixTimestamp,
-    ) -> Result<Option<EpochRewarding>, NodeStatusApiError> {
+    ) -> Result<Option<EpochRewarding>, ValidatorApiStorageError> {
         self.manager
             .get_epoch_rewarding_entry(epoch_timestamp)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)
     }
 
     /// Sets the `finished` field on the epoch rewarding to true and inserts the rewarding report into
@@ -620,16 +616,16 @@ impl NodeStatusStorage {
     pub(crate) async fn finish_rewarding_epoch_and_insert_report(
         &self,
         report: RewardingReport,
-    ) -> Result<(), NodeStatusApiError> {
+    ) -> Result<(), ValidatorApiStorageError> {
         self.manager
             .update_finished_epoch_rewarding(report.epoch_rewarding_id)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)?;
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)?;
 
         self.manager
             .insert_rewarding_report(report)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)
     }
 
     /// Inserts new failed mixnode reward chunk information into the database.
@@ -641,27 +637,11 @@ impl NodeStatusStorage {
     pub(crate) async fn insert_failed_mixnode_reward_chunk(
         &self,
         failed_chunk: FailedMixnodeRewardChunk,
-    ) -> Result<i64, NodeStatusApiError> {
+    ) -> Result<i64, ValidatorApiStorageError> {
         self.manager
             .insert_failed_mixnode_reward_chunk(failed_chunk)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)
-    }
-
-    /// Inserts new failed gateway reward chunk information into the database.
-    /// Returns id of the newly created entry.
-    ///
-    /// # Arguments
-    ///
-    /// * `failed_chunk`: chunk information to insert.
-    pub(crate) async fn insert_failed_gateway_reward_chunk(
-        &self,
-        failed_chunk: FailedGatewayRewardChunk,
-    ) -> Result<i64, NodeStatusApiError> {
-        self.manager
-            .insert_failed_gateway_reward_chunk(failed_chunk)
-            .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)
     }
 
     /// Inserts information into the database about a mixnode that might have been unfairly unrewarded this epoch.
@@ -672,25 +652,10 @@ impl NodeStatusStorage {
     pub(crate) async fn insert_possibly_unrewarded_mixnode(
         &self,
         mixnode: PossiblyUnrewardedMixnode,
-    ) -> Result<(), NodeStatusApiError> {
+    ) -> Result<(), ValidatorApiStorageError> {
         self.manager
             .insert_possibly_unrewarded_mixnode(mixnode)
             .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)
-    }
-
-    /// Inserts information into the database about a gateway that might have been unfairly unrewarded this epoch.
-    ///
-    /// # Arguments
-    ///
-    /// * `gateway`: mixnode information to insert.
-    pub(crate) async fn insert_possibly_unrewarded_gateway(
-        &self,
-        gateway: PossiblyUnrewardedGateway,
-    ) -> Result<(), NodeStatusApiError> {
-        self.manager
-            .insert_possibly_unrewarded_gateway(gateway)
-            .await
-            .map_err(|_| NodeStatusApiError::InternalDatabaseError)
+            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError)
     }
 }
diff --git a/validator-api/src/storage/models.rs b/validator-api/src/storage/models.rs
index 8c878ca85d..1c5ffdf883 100644
--- a/validator-api/src/storage/models.rs
+++ b/validator-api/src/storage/models.rs
@@ -29,10 +29,8 @@ pub(crate) struct RewardingReport {
     pub(crate) epoch_rewarding_id: i64,
 
     pub(crate) eligible_mixnodes: i64,
-    pub(crate) eligible_gateways: i64,
 
     pub(crate) possibly_unrewarded_mixnodes: i64,
-    pub(crate) possibly_unrewarded_gateways: i64,
 }
 
 pub(crate) struct FailedMixnodeRewardChunk {
@@ -47,16 +45,3 @@ pub(crate) struct PossiblyUnrewardedMixnode {
     pub(crate) identity: String,
     pub(crate) uptime: u8,
 }
-
-pub(crate) struct FailedGatewayRewardChunk {
-    // references particular epoch_rewarding (there can be multiple chunks in a rewarding epoch)
-    pub(crate) epoch_rewarding_id: i64,
-    pub(crate) error_message: String,
-}
-
-pub(crate) struct PossiblyUnrewardedGateway {
-    // references particular FailedGatewayRewardChunk (there can be multiple nodes in a chunk)
-    pub(crate) chunk_id: i64,
-    pub(crate) identity: String,
-    pub(crate) uptime: u8,
-}
diff --git a/wallet-web/pages/send.tsx b/wallet-web/pages/send.tsx
index 3290822cb4..9788b7781b 100644
--- a/wallet-web/pages/send.tsx
+++ b/wallet-web/pages/send.tsx
@@ -195,6 +195,7 @@ export default function SendFunds() {
                     variant="contained"
                     color="primary"
                     type="submit"
+                    data-testid="button"
                     disabled={checkButtonDisabled()}
                   >
                     {activeStep === 1