Revert "Update Cargo.toml"

This reverts commit d8a95d3810.

Cargo.toml

@@ -127,6 +127,7 @@ serde-json-wasm = "=0.5.0"
 cosmwasm-storage = "=1.3.0"
 cosmrs = "=0.14.0"
 # same version as used by cosmrs
+tendermint-rpc = "=0.32"
 cw-utils = "=1.0.1"
 cw-storage-plus = "=1.1.0"
 cw2 = { version = "=1.1.0" }

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

@@ -78,6 +78,7 @@ pub struct Config {
     // however, I'd really prefer to use something more strongly typed (i.e. AccountId vs String)
     pub(crate) mixnet_contract_address: Option<AccountId>,
     pub(crate) vesting_contract_address: Option<AccountId>,
+    pub(crate) bandwidth_claim_contract_address: Option<AccountId>,
     pub(crate) coconut_bandwidth_contract_address: Option<AccountId>,
     pub(crate) group_contract_address: Option<AccountId>,
     pub(crate) multisig_contract_address: Option<AccountId>,
@@ -125,6 +126,10 @@ impl Config {
                 details.contracts.vesting_contract_address.as_ref(),
                 prefix,
             )?,
+            bandwidth_claim_contract_address: Self::parse_optional_account(
+                details.contracts.bandwidth_claim_contract_address.as_ref(),
+                prefix,
+            )?,
             coconut_bandwidth_contract_address: Self::parse_optional_account(
                 details
                     .contracts
@@ -543,6 +548,10 @@ impl<C> NyxdClient<C> {
         self.config.vesting_contract_address = Some(address);
     }
 
+    pub fn set_bandwidth_claim_contract_address(&mut self, address: AccountId) {
+        self.config.bandwidth_claim_contract_address = Some(address);
+    }
+
     pub fn set_coconut_bandwidth_contract_address(&mut self, address: AccountId) {
         self.config.coconut_bandwidth_contract_address = Some(address);
     }
@@ -571,6 +580,17 @@ impl<C> NyxdClient<C> {
         self.config.vesting_contract_address.as_ref().unwrap()
     }
 
+    // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
+    // note: what unwrap is doing here is just moving a failure that would have normally
+    // occurred in `connect` when attempting to parse an empty address,
+    // so it's not introducing new source of failure (just moves it)
+    pub fn bandwidth_claim_contract_address(&self) -> &AccountId {
+        self.config
+            .bandwidth_claim_contract_address
+            .as_ref()
+            .unwrap()
+    }
+
     // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
     // note: what unwrap is doing here is just moving a failure that would have normally
     // occurred in `connect` when attempting to parse an empty address,

common/network-defaults/src/lib.rs

@@ -25,6 +25,7 @@ pub struct ChainDetails {
 pub struct NymContracts {
     pub mixnet_contract_address: Option<String>,
     pub vesting_contract_address: Option<String>,
+    pub bandwidth_claim_contract_address: Option<String>,
     pub coconut_bandwidth_contract_address: Option<String>,
     pub group_contract_address: Option<String>,
     pub multisig_contract_address: Option<String>,
@@ -111,6 +112,10 @@ impl NymNetworkDetails {
             .with_vesting_contract(Some(
                 var(var_names::VESTING_CONTRACT_ADDRESS).expect("vesting contract not set"),
             ))
+            .with_bandwidth_claim_contract(Some(
+                var(var_names::BANDWIDTH_CLAIM_CONTRACT_ADDRESS)
+                    .expect("bandwidth claim contract not set"),
+            ))
             .with_coconut_bandwidth_contract(Some(
                 var(var_names::COCONUT_BANDWIDTH_CONTRACT_ADDRESS)
                     .expect("coconut bandwidth contract not set"),
@@ -146,6 +151,9 @@ impl NymNetworkDetails {
             contracts: NymContracts {
                 mixnet_contract_address: parse_optional_str(mainnet::MIXNET_CONTRACT_ADDRESS),
                 vesting_contract_address: parse_optional_str(mainnet::VESTING_CONTRACT_ADDRESS),
+                bandwidth_claim_contract_address: parse_optional_str(
+                    mainnet::BANDWIDTH_CLAIM_CONTRACT_ADDRESS,
+                ),
                 coconut_bandwidth_contract_address: parse_optional_str(
                     mainnet::COCONUT_BANDWIDTH_CONTRACT_ADDRESS,
                 ),
@@ -208,6 +216,12 @@ impl NymNetworkDetails {
         self
     }
 
+    #[must_use]
+    pub fn with_bandwidth_claim_contract<S: Into<String>>(mut self, contract: Option<S>) -> Self {
+        self.contracts.bandwidth_claim_contract_address = contract.map(Into::into);
+        self
+    }
+
     #[must_use]
     pub fn with_coconut_bandwidth_contract<S: Into<String>>(mut self, contract: Option<S>) -> Self {
         self.contracts.coconut_bandwidth_contract_address = contract.map(Into::into);

common/network-defaults/src/mainnet.rs

@@ -13,6 +13,8 @@ pub const MIXNET_CONTRACT_ADDRESS: &str =
     "n17srjznxl9dvzdkpwpw24gg668wc73val88a6m5ajg6ankwvz9wtst0cznr";
 pub const VESTING_CONTRACT_ADDRESS: &str =
     "n1nc5tatafv6eyq7llkr2gv50ff9e22mnf70qgjlv737ktmt4eswrq73f2nw";
+pub(crate) const BANDWIDTH_CLAIM_CONTRACT_ADDRESS: &str =
+    "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0";
 pub(crate) const COCONUT_BANDWIDTH_CONTRACT_ADDRESS: &str =
     "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0";
 pub(crate) const GROUP_CONTRACT_ADDRESS: &str = "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0";
@@ -68,6 +70,10 @@ pub fn export_to_env() {
         var_names::VESTING_CONTRACT_ADDRESS,
         VESTING_CONTRACT_ADDRESS,
     );
+    set_var_to_default(
+        var_names::BANDWIDTH_CLAIM_CONTRACT_ADDRESS,
+        BANDWIDTH_CLAIM_CONTRACT_ADDRESS,
+    );
     set_var_to_default(
         var_names::COCONUT_BANDWIDTH_CONTRACT_ADDRESS,
         COCONUT_BANDWIDTH_CONTRACT_ADDRESS,
@@ -109,6 +115,10 @@ pub fn export_to_env_if_not_set() {
         var_names::VESTING_CONTRACT_ADDRESS,
         VESTING_CONTRACT_ADDRESS,
     );
+    set_var_conditionally_to_default(
+        var_names::BANDWIDTH_CLAIM_CONTRACT_ADDRESS,
+        BANDWIDTH_CLAIM_CONTRACT_ADDRESS,
+    );
     set_var_conditionally_to_default(
         var_names::COCONUT_BANDWIDTH_CONTRACT_ADDRESS,
         COCONUT_BANDWIDTH_CONTRACT_ADDRESS,

common/network-defaults/src/var_names.rs

@@ -12,6 +12,7 @@ pub const STAKE_DENOM_DISPLAY: &str = "STAKE_DENOM_DISPLAY";
 pub const DENOMS_EXPONENT: &str = "DENOMS_EXPONENT";
 pub const MIXNET_CONTRACT_ADDRESS: &str = "MIXNET_CONTRACT_ADDRESS";
 pub const VESTING_CONTRACT_ADDRESS: &str = "VESTING_CONTRACT_ADDRESS";
+pub const BANDWIDTH_CLAIM_CONTRACT_ADDRESS: &str = "BANDWIDTH_CLAIM_CONTRACT_ADDRESS";
 pub const COCONUT_BANDWIDTH_CONTRACT_ADDRESS: &str = "COCONUT_BANDWIDTH_CONTRACT_ADDRESS";
 pub const GROUP_CONTRACT_ADDRESS: &str = "GROUP_CONTRACT_ADDRESS";
 pub const MULTISIG_CONTRACT_ADDRESS: &str = "MULTISIG_CONTRACT_ADDRESS";

documentation/dev-portal/book.toml

@@ -17,7 +17,7 @@ src = "src"
 # - run `mdbook build`: this will rebuild the `./theme` directory
 # - change value of `turn-off` back to `true`
 [preprocessor.theme]
-pagetoc = true
+pagetoc        = true
 # some variables related (defined in theme/css/variables.css)
 # `content-max-width` + `pagetoc-width` = 95% seems the best
 pagetoc-width            = "13%"
@@ -37,7 +37,7 @@ nav-chapters-min-width    = "auto"
 chapter-line-height       = "2em"
 section-line-height       = "1.5em"
 
-# if true, never read and touch the files in theme dir
+# # if true, never read and touch the files in theme dir
 turn-off = false
 
 [preprocessor.admonish]
@@ -77,7 +77,7 @@ curly-quotes = true
 # mathjax-support = false # useful if we want to pull equations in ?
 copy-fonts = true
 no-section-label = false
-additional-css = ["theme/pagetoc.css", "././mdbook-admonish.css", "custom.css"]
+additional-css = ["theme/pagetoc.css", "././mdbook-admonish.css", "last-changed.css"]
 additional-js  = ["theme/pagetoc.js"]
 git-repository-url = "https://github.com/nymtech/nym"
 git-repository-icon = "fa-github"

documentation/dev-portal/custom.css

@@ -1,38 +0,0 @@
-:root {
-  --mono-font: "Open Sans", Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono",
-    monospace, monospace;
-}
-.coal {
-  --bg: #121726;
-  --fg: #f2f2f2;
-
-  --sidebar-bg: #121726;
-  --sidebar-fg: #f2f2f2;
-  --sidebar-active: #fb6e4e;
-
-  --icons: #f2f2f2;
-  --icons-hover: #fb6e4e;
-
-  --links: #fb6e4e;
-}
-
-.light {
-  --bg: #f4f6f8;
-  --fg: #121726;
-
-  --sidebar-bg: #f4f6f8;
-  --sidebar-fg: #121726;
-  --sidebar-active: #fb6e4e;
-
-  --icons: #121726;
-  --icons-hover: #fb6e4e;
-
-  --links: #fb6e4e;
-}
-
-footer {
-  font-size: 0.8em;
-  text-align: center;
-  border-top: 1px solid black;
-  padding: 5px 0;
-}

documentation/dev-portal/last-changed.css

@@ -0,0 +1,6 @@
+footer {
+    font-size: 0.8em;
+    text-align: center;
+    border-top: 1px solid black;
+    padding: 5px 0;
+  }

documentation/dev-portal/theme/css/variables.css

@@ -13,7 +13,7 @@
 }
 
 @media only screen and (max-width:1439px) {
-  :root{
+ :root{
     --content-max-width: 98%;
   }
 }
@@ -290,4 +290,4 @@
         --searchresults-li-bg: #2b2b2f;
         --search-mark-bg: #355c7d;
     }
-}
+}

documentation/docs/src/bandwidth-credentials.md

@@ -20,6 +20,7 @@ DENOMS_EXPONENT=6
 REWARDING_VALIDATOR_ADDRESS="nymt1mxuweurc066kprnngtm8zmvam7m2nw26yatpmv"
 MIXNET_CONTRACT_ADDRESS="nymt1dlsvvgey26ernlj0sq2afjluh3qd4ap0k9eerekfkw5algqrwqksaf2qf7"
 VESTING_CONTRACT_ADDRESS="nymt19g9xuqrvz2frv905v3fc7puryfypluhg383q9zwsmedrlqekfgys62ykm4"
+BANDWIDTH_CLAIM_CONTRACT_ADDRESS="nymt1rhmk9udessnv3r8f3eh2s03f45svnjaczpmcqz"
 MULTISIG_CONTRACT_ADDRESS="nymt142dkm8xe9f0ytyarp7ww4kvclva65705jphxsk9exn3nqdsm8jkqnp06ac"
 COCONUT_BANDWIDTH_CONTRACT_ADDRESS="nymt1ty0frysegskh6ndm3v96z5xdq66qzcu0aw7xcxlgp54jg0mjwlgqplc6v0"
 COCONUT_DKG_CONTRACT_ADDRESS="nymt1gwk6muhmzeuxje7df7rjvqwl2vex0kj4t2hwuzmyx5k62kfusu5qk4k5z4"

envs/local.env

@@ -11,6 +11,7 @@ STAKE_DENOM_DISPLAY=nyx
 DENOMS_EXPONENT=6
 MIXNET_CONTRACT_ADDRESS=n1xsml6tm6pnx8nsuz3a54cznh55g6nuwu9ug9t92ucjkq5ewp5w9syxeqsv
 VESTING_CONTRACT_ADDRESS=n1xr3rq8yvd7qplsw5yx90ftsr2zdhg4e9z60h5duusgxpv72hud3sjkxkav
+BANDWIDTH_CLAIM_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
 COCONUT_BANDWIDTH_CONTRACT_ADDRESS=n1lp5zex6685kd22agzskhqsylpnssxnweyuvsz4edr4p4ta92qf3q3dhmsx
 GROUP_CONTRACT_ADDRESS=n1rw8fw2mpcpzzq3jpa4e52ufawnmj5a4u68p35umvgskewuw0nlzsaa5w4m
 MULTISIG_CONTRACT_ADDRESS=n1rw8fw2mpcpzzq3jpa4e52ufawnmj5a4u68p35umvgskewuw0nlzsaa5w4m

envs/mainnet.env

@@ -11,6 +11,7 @@ STAKE_DENOM_DISPLAY=nyx
 DENOMS_EXPONENT=6
 MIXNET_CONTRACT_ADDRESS=n17srjznxl9dvzdkpwpw24gg668wc73val88a6m5ajg6ankwvz9wtst0cznr
 VESTING_CONTRACT_ADDRESS=n1nc5tatafv6eyq7llkr2gv50ff9e22mnf70qgjlv737ktmt4eswrq73f2nw
+BANDWIDTH_CLAIM_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
 COCONUT_BANDWIDTH_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
 GROUP_CONTRACT_ADDRESS=n1rw8fw2mpcpzzq3jpa4e52ufawnmj5a4u68p35umvgskewuw0nlzsaa5w4m
 MULTISIG_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0

envs/qa-qwerty.env

@@ -11,6 +11,7 @@ STAKE_DENOM_DISPLAY=nyx
 DENOMS_EXPONENT=6
 MIXNET_CONTRACT_ADDRESS=n14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sjyvg3g
 VESTING_CONTRACT_ADDRESS=n1nc5tatafv6eyq7llkr2gv50ff9e22mnf70qgjlv737ktmt4eswrq73f2nw
+BANDWIDTH_CLAIM_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
 COCONUT_BANDWIDTH_CONTRACT_ADDRESS=n19d2nwj7fdhxqmyvgy8lf3ad49a6vmww4shryhrkj2mqk36att66s6xzszw
 GROUP_CONTRACT_ADDRESS=n1fqquzw4mk0pkamgr2ywt2v7h2j9nuyjjn4gvpy8zlpp6xn0uyuzqfm28l5
 MULTISIG_CONTRACT_ADDRESS=n1gaq3666chd5348apj8cka8t2mckv7azp9espyr7wgpxyuzur5d0sazpysy

envs/qa.env

@@ -11,6 +11,7 @@ STAKE_DENOM_DISPLAY=nyx
 DENOMS_EXPONENT=6
 MIXNET_CONTRACT_ADDRESS=n1rjzps6qrmdqmf0xz4cn4x4rcmqeqzq6hnzqg4wcvd0r2lyasdq5sepn5s8
 VESTING_CONTRACT_ADDRESS=n1xr3rq8yvd7qplsw5yx90ftsr2zdhg4e9z60h5duusgxpv72hud3sjkxkav
+BANDWIDTH_CLAIM_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
 COCONUT_BANDWIDTH_CONTRACT_ADDRESS=n1ghd753shjuwexxywmgs4xz7x2q732vcn7ty4yw
 GROUP_CONTRACT_ADDRESS=n1rw8fw2mpcpzzq3jpa4e52ufawnmj5a4u68p35umvgskewuw0nlzsaa5w4m
 MULTISIG_CONTRACT_ADDRESS=n17p9rzwnnfxcjp32un9ug7yhhzgtkhvl988qccs

envs/sandbox.env

@@ -13,6 +13,7 @@ DENOMS_EXPONENT=6
 REWARDING_VALIDATOR_ADDRESS=n1pefc2utwpy5w78p2kqdsfmpjxfwmn9d39k5mqa
 MIXNET_CONTRACT_ADDRESS=n1xr3rq8yvd7qplsw5yx90ftsr2zdhg4e9z60h5duusgxpv72hud3sjkxkav
 VESTING_CONTRACT_ADDRESS=n1unyuj8qnmygvzuex3dwmg9yzt9alhvyeat0uu0jedg2wj33efl5qackslz
+BANDWIDTH_CLAIM_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
 COCONUT_BANDWIDTH_CONTRACT_ADDRESS=n16a32stm6kknhq5cc8rx77elr66pygf2hfszw7wvpq746x3uffylqkjar4l
 GROUP_CONTRACT_ADDRESS=n1pd7kfgvr5tpcv0xnlv46c4jsq9jg2r799xxrcwqdm4l2jhq2pjwqrmz5ju
 MULTISIG_CONTRACT_ADDRESS=n14ph4e660eyqz0j36zlkaey4zgzexm5twkmjlqaequxr2cjm9eprqsmad6k

nym-wallet/nym-wallet-types/src/network/qa.rs

@@ -13,6 +13,8 @@ pub(crate) const MIXNET_CONTRACT_ADDRESS: &str =
     "n10qt8wg0n7z740ssvf3urmvgtjhxpyp74hxqvqt7z226gykuus7eq5u9pvq";
 pub(crate) const VESTING_CONTRACT_ADDRESS: &str =
     "n1vguuxez2h5ekltfj9gjd62fs5k4rl2zy5hfrncasykzw08rezpfstk9xtk";
+pub(crate) const BANDWIDTH_CLAIM_CONTRACT_ADDRESS: &str =
+    "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0";
 pub(crate) const COCONUT_BANDWIDTH_CONTRACT_ADDRESS: &str =
     "n1ghd753shjuwexxywmgs4xz7x2q732vcn7ty4yw";
 pub(crate) const GROUP_CONTRACT_ADDRESS: &str =
@@ -46,6 +48,7 @@ pub(crate) fn network_details() -> nym_network_defaults::NymNetworkDetails {
         contracts: NymContracts {
             mixnet_contract_address: parse_optional_str(MIXNET_CONTRACT_ADDRESS),
             vesting_contract_address: parse_optional_str(VESTING_CONTRACT_ADDRESS),
+            bandwidth_claim_contract_address: parse_optional_str(BANDWIDTH_CLAIM_CONTRACT_ADDRESS),
             coconut_bandwidth_contract_address: parse_optional_str(
                 COCONUT_BANDWIDTH_CONTRACT_ADDRESS,
             ),

nym-wallet/nym-wallet-types/src/network/sandbox.rs

@@ -11,6 +11,8 @@ pub(crate) const STAKE_DENOM: DenomDetails = DenomDetails::new("unyxt", "nyxt",
 
 pub(crate) const MIXNET_CONTRACT_ADDRESS: &str = "nymt1ghd753shjuwexxywmgs4xz7x2q732vcnstz02j";
 pub(crate) const VESTING_CONTRACT_ADDRESS: &str = "nymt14ejqjyq8um4p3xfqj74yld5waqljf88fn549lh";
+pub(crate) const BANDWIDTH_CLAIM_CONTRACT_ADDRESS: &str =
+    "nymt17p9rzwnnfxcjp32un9ug7yhhzgtkhvl9f8xzkv";
 pub(crate) const COCONUT_BANDWIDTH_CONTRACT_ADDRESS: &str =
     "nymt1nz0r0au8aj6dc00wmm3ufy4g4k86rjzlgq608r";
 pub(crate) const GROUP_CONTRACT_ADDRESS: &str = "nymt1k8re7jwz6rnnwrktnejdwkwnncte7ek7kk6fvg";
@@ -37,6 +39,7 @@ pub(crate) fn network_details() -> nym_network_defaults::NymNetworkDetails {
         contracts: NymContracts {
             mixnet_contract_address: parse_optional_str(MIXNET_CONTRACT_ADDRESS),
             vesting_contract_address: parse_optional_str(VESTING_CONTRACT_ADDRESS),
+            bandwidth_claim_contract_address: parse_optional_str(BANDWIDTH_CLAIM_CONTRACT_ADDRESS),
             coconut_bandwidth_contract_address: parse_optional_str(
                 COCONUT_BANDWIDTH_CONTRACT_ADDRESS,
             ),

nym-wallet/src-tauri/src/config/mod.rs

@@ -237,6 +237,15 @@ impl Config {
             .expect("Wrong format for vesting contract address")
     }
 
+    pub fn get_bandwidth_claim_contract_address(&self, network: WalletNetwork) -> CosmosAccountId {
+        self.base
+            .networks
+            .bandwidth_claim_contract_address(&network)
+            .expect("No bandwidth claim contract address found in config")
+            .parse()
+            .expect("Wrong format for bandwidth claim contract address")
+    }
+
     pub fn set_default_nyxd_urls(&mut self, urls: &HashMap<WalletNetwork, Url>) {
         for (network, url) in urls {
             self.set_default_nyxd_url(url.to_owned(), network);
@@ -490,6 +499,12 @@ impl SupportedNetworks {
             .map(|network_details| network_details.vesting_contract_address.as_str())
     }
 
+    fn bandwidth_claim_contract_address(&self, network: &WalletNetwork) -> Option<&str> {
+        self.networks
+            .get(network)
+            .map(|network_details| network_details.bandwidth_claim_contract_address.as_str())
+    }
+
     fn validators(&self, network: &WalletNetwork) -> impl Iterator<Item = &ValidatorDetails> {
         self.networks
             .get(network)
@@ -507,6 +522,7 @@ struct NetworkDetails {
     stake_denom: DenomDetailsOwned,
     mixnet_contract_address: String,
     vesting_contract_address: String,
+    bandwidth_claim_contract_address: String,
     statistics_service_url: String,
     validators: Vec<ValidatorDetails>,
 }
@@ -527,6 +543,10 @@ impl From<NymNetworkDetails> for NetworkDetails {
                 .contracts
                 .vesting_contract_address
                 .unwrap_or_default(),
+            bandwidth_claim_contract_address: details
+                .contracts
+                .bandwidth_claim_contract_address
+                .unwrap_or_default(),
             statistics_service_url: "".to_string(),
             validators: details.endpoints,
         }

nym-wallet/src-tauri/src/operations/mixnet/account.rs

@@ -282,7 +282,12 @@ fn create_clients(
         let network_details = NymNetworkDetails::from(network)
             .clone()
             .with_mixnet_contract(Some(config.get_mixnet_contract_address(network).as_ref()))
-            .with_vesting_contract(Some(config.get_vesting_contract_address(network).as_ref()));
+            .with_vesting_contract(Some(config.get_vesting_contract_address(network).as_ref()))
+            .with_bandwidth_claim_contract(Some(
+                config
+                    .get_bandwidth_claim_contract_address(network)
+                    .as_ref(),
+            ));
 
         let config = nym_validator_client::Config::try_from_nym_network_details(&network_details)?
             .with_urls(nyxd_url, api_url);