Feature/wallet delegation UI squashed

.github/workflows/nym-wallet-publish-macos.yml

@@ -66,6 +66,7 @@ jobs:
           APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          ADMIN_ADDRESS: ${{ secrets.WALLET_ADMIN_ADDRESS }}
         run: yarn && yarn build
 
       - name: Upload to release based on tag name

.github/workflows/nym-wallet-publish-ubuntu.yml

@@ -44,6 +44,7 @@ jobs:
         env:
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          ADMIN_ADDRESS: ${{ secrets.WALLET_ADMIN_ADDRESS }}
       - name: Upload to release based on tag name
         uses: softprops/action-gh-release@v1
         with:

.github/workflows/nym-wallet-publish-windows10.yml

@@ -65,6 +65,7 @@ jobs:
           WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          ADMIN_ADDRESS: ${{ secrets.WALLET_ADMIN_ADDRESS }}
         run: yarn build
 
       - name: Upload to release based on tag name

CHANGELOG.md

@@ -21,6 +21,9 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - wallet: compound and claim reward endpoints for operators and delegators ([#1302])
 - wallet: require password to switch accounts
 - wallet: the wallet backend learned how to keep track of validator name, either hardcoded or by querying the status endpoint.
+- wallet: new delegation and rewards UI
+- wallet: show version in nav bar
+- wallet: contract admin route put back
 - network-statistics: a new mixnet service that aggregates and exposes anonymized data about mixnet services ([#1328])
 
 ### Fixed

Cargo.toml

@@ -58,6 +58,7 @@ members = [
     "common/socks5/requests",
     "common/task",
     "common/topology",
+    "common/types",
     "common/wasm-utils",
     "explorer-api",
     "gateway",
@@ -67,6 +68,7 @@ members = [
     "service-providers/network-statistics",
     "validator-api",
     "validator-api/validator-api-requests",
+    "tools/ts-rs-cli"
 ]
 
 default-members = [
@@ -79,4 +81,4 @@ default-members = [
     "explorer-api",
 ]
 
-exclude = ["explorer", "contracts", "tokenomics-py", "clients/webassembly"]
+exclude = ["explorer", "contracts", "tokenomics-py", "clients/webassembly", "nym-wallet"]

Makefile

@@ -54,3 +54,7 @@ fmt-wallet:
 
 wasm:
 	RUSTFLAGS='-C link-arg=-s' cargo build --manifest-path contracts/Cargo.toml --release --target wasm32-unknown-unknown
+
+generate-typescript:
+	cd tools/ts-rs-cli && cargo run && cd ../..
+	yarn types:lint:fix

common/client-libs/validator-client/Cargo.toml

@@ -58,3 +58,5 @@ nymd-client = [
     "itertools",
     "cosmwasm-std",
 ]
+generate-ts = []
+

common/client-libs/validator-client/src/nymd/cosmwasm_client/logs.rs

@@ -4,11 +4,11 @@
 use crate::nymd::error::NymdError;
 use cosmrs::tendermint::abci;
 use itertools::Itertools;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
 // it seems that currently validators just emit stringified events (which are also returned as part of deliverTx response)
 // as theirs logs
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 pub struct Log {
     #[serde(default)]
     // weird thing is that the first msg_index seems to always be undefined on the raw logs

common/client-libs/validator-client/src/nymd/mod.rs

@@ -289,7 +289,17 @@ impl<C> NymdClient<C> {
     where
         C: CosmWasmClient + Sync,
     {
-        Ok(self.client.get_block(None).await?.block.header.time)
+        self.get_block_timestamp(None).await
+    }
+
+    pub async fn get_block_timestamp(
+        &self,
+        height: Option<u32>,
+    ) -> Result<TendermintTime, NymdError>
+    where
+        C: CosmWasmClient + Sync,
+    {
+        Ok(self.client.get_block(height).await?.block.header.time)
     }
 
     pub async fn get_current_block_height(&self) -> Result<Height, NymdError>

common/client-libs/validator-client/src/nymd/traits/vesting_query_client.rs

@@ -183,6 +183,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
             .map(Into::into)
     }
 
+    /// Returns the total amount of delegated tokens that have vested
     async fn delegated_vesting(
         &self,
         vesting_account_address: &str,

common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml

@@ -18,12 +18,13 @@ fixed = { version = "1.1", features = ["serde"] }
 az = "1.1"
 log = "0.4.14"
 time = { version = "0.3.6", features = ["parsing", "formatting"] }
+ts-rs = "6.1.2"
 
 contracts-common = { path = "../contracts-common" }
 
 [dev-dependencies]
 time = { version = "0.3.5", features = ["serde", "macros"] }
-ts-rs = "6.1.2"
 
 [features]
 default = []
+generate-ts = []

common/cosmwasm-smart-contracts/mixnet-contract/src/gateway.rs

@@ -8,11 +8,6 @@ use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
 use std::fmt::Display;
 
-#[cfg_attr(test, derive(ts_rs::TS))]
-#[cfg_attr(
-    test,
-    ts(export, export_to = "../../../nym-wallet/src/types/rust/gateway.ts")
-)]
 #[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema)]
 pub struct Gateway {
     pub host: String,

common/cosmwasm-smart-contracts/mixnet-contract/src/mixnode.rs

@@ -14,13 +14,10 @@ use serde_repr::{Deserialize_repr, Serialize_repr};
 use std::cmp::Ordering;
 use std::fmt::Display;
 
-#[cfg_attr(test, derive(ts_rs::TS))]
+#[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
-    test,
-    ts(
-        export,
-        export_to = "../../../nym-wallet/src/types/rust/rewardedsetnodestatus.ts"
-    )
+    feature = "generate-ts",
+    ts(export_to = "ts-packages/types/src/types/rust/RewardedSetNodeStatus.ts")
 )]
 #[derive(Clone, Copy, Debug, Deserialize, Serialize, JsonSchema, PartialEq)]
 pub enum RewardedSetNodeStatus {
@@ -109,11 +106,6 @@ impl PendingUndelegate {
     }
 }
 
-#[cfg_attr(test, derive(ts_rs::TS))]
-#[cfg_attr(
-    test,
-    ts(export, export_to = "../../../nym-wallet/src/types/rust/mixnode.ts")
-)]
 #[derive(Clone, Debug, Deserialize, PartialEq, PartialOrd, Serialize, JsonSchema)]
 pub struct MixNode {
     pub host: String,

common/cosmwasm-smart-contracts/vesting-contract/Cargo.toml

@@ -12,6 +12,7 @@ serde = { version = "1.0", features = ["derive"] }
 schemars = "0.8"
 cw-storage-plus = "0.13.4"
 config = { path = "../../config" }
-
-[dev-dependencies]
 ts-rs = "6.1.2"
+
+[features]
+generate-ts = []

common/cosmwasm-smart-contracts/vesting-contract/src/lib.rs

@@ -14,10 +14,10 @@ pub fn one_ucoin() -> Coin {
     Coin::new(1, DENOM)
 }
 
-#[cfg_attr(test, derive(ts_rs::TS))]
+#[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
-    test,
-    ts(export, export_to = "../../../nym-wallet/src/types/rust/period.ts")
+    feature = "generate-ts",
+    ts(export_to = "ts-packages/types/src/types/rust/Period.ts")
 )]
 #[derive(Debug, PartialEq, Serialize, Deserialize, Clone, JsonSchema)]
 pub enum Period {

common/types/Cargo.toml

@@ -0,0 +1,40 @@
+[package]
+name = "nym-types"
+version = "1.0.0"
+description = "Nym common types"
+authors = ["Nym Technologies SA"]
+edition = "2021"
+rust-version = "1.58"
+
+[dependencies]
+eyre = "0.6.5"
+log = "0.4"
+itertools = "0.10"
+reqwest = "0.11.9"
+schemars = "0.8"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+strum = { version = "0.23", features = ["derive"] }
+thiserror = "1.0"
+url = "2.2"
+ts-rs = "6.1.2"
+
+cosmwasm-std = "1.0.0-beta8"
+cosmrs = "0.7.0"
+
+validator-client = { path = "../../common/client-libs/validator-client", features = [
+    "nymd-client",
+] }
+mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract" }
+vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract" }
+config = { path = "../../common/config" }
+coconut-interface = { path = "../../common/coconut-interface" }
+# Used for Type conversion, can be extracted but its a lot of work
+vesting-contract = { path = "../../contracts/vesting" }
+
+[dev-dependencies]
+tempfile = "3.3.0"
+
+[features]
+default = []
+generate-ts = []