Compare commits

...

1 Commits

Author SHA1 Message Date
Bogdan-Ștefan Neacșu c835ab24fd Bump some versions for helios integration 2023-03-02 17:53:09 +02:00
11 changed files with 22 additions and 40 deletions
Generated
+10 -10
View File
@@ -677,7 +677,7 @@ dependencies = [
[[package]]
name = "client-core"
version = "1.1.10"
version = "1.1.11"
dependencies = [
"async-trait",
"dashmap 5.4.0",
@@ -1802,7 +1802,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
[[package]]
name = "explorer-api"
version = "1.1.10"
version = "1.1.11"
dependencies = [
"chrono",
"clap 4.1.4",
@@ -3281,7 +3281,7 @@ dependencies = [
[[package]]
name = "nym-api"
version = "1.1.11"
version = "1.1.12"
dependencies = [
"anyhow",
"async-trait",
@@ -3391,7 +3391,7 @@ dependencies = [
[[package]]
name = "nym-cli"
version = "1.1.10"
version = "1.1.11"
dependencies = [
"anyhow",
"base64 0.13.1",
@@ -3449,7 +3449,7 @@ dependencies = [
[[package]]
name = "nym-client"
version = "1.1.10"
version = "1.1.11"
dependencies = [
"clap 4.1.4",
"client-core",
@@ -3543,7 +3543,7 @@ dependencies = [
[[package]]
name = "nym-gateway"
version = "1.1.10"
version = "1.1.11"
dependencies = [
"anyhow",
"async-trait",
@@ -3620,7 +3620,7 @@ dependencies = [
[[package]]
name = "nym-mixnode"
version = "1.1.11"
version = "1.1.12"
dependencies = [
"anyhow",
"atty",
@@ -3675,7 +3675,7 @@ dependencies = [
[[package]]
name = "nym-network-requester"
version = "1.1.10"
version = "1.1.11"
dependencies = [
"async-trait",
"clap 4.1.4",
@@ -3713,7 +3713,7 @@ dependencies = [
[[package]]
name = "nym-network-statistics"
version = "1.1.10"
version = "1.1.11"
dependencies = [
"dirs",
"log",
@@ -3788,7 +3788,7 @@ dependencies = [
[[package]]
name = "nym-socks5-client"
version = "1.1.10"
version = "1.1.11"
dependencies = [
"clap 4.1.4",
"client-core",
@@ -36,9 +36,9 @@ nym-api-requests = { path = "../../../nym-api/nym-api-requests" }
# at some point it might be possible to make it wasm-compatible
# perhaps after https://github.com/cosmos/cosmos-rust/pull/97 is resolved (and tendermint-rs is updated)
async-trait = { version = "0.1.51", optional = true }
bip39 = { version = "1", features = ["rand"], optional = true }
bip39 = { version = "2", features = ["rand"], optional = true }
nym-config = { path = "../../config", optional = true }
cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support", features = ["rpc", "bip32", "cosmwasm"], optional = true}
cosmrs = { version = "0.8.0", features = ["rpc", "bip32", "cosmwasm"], optional = true}
cw3 = { version = "0.13.4", optional = true }
cw4 = { version = "0.13.4", optional = true }
prost = { version = "0.10", default-features = false, optional = true }
@@ -121,7 +121,7 @@ impl GasAdjustable for Gas {
mod sealed {
use cosmrs::tx::{self, Gas};
use cosmrs::Coin as CosmosCoin;
use cosmrs::{AccountId, Decimal as CosmosDecimal, Denom as CosmosDenom};
use cosmrs::{AccountId, Denom as CosmosDenom};
use serde::{Deserialize, Deserializer, Serialize, Serializer};
fn cosmos_denom_inner_getter(val: &CosmosDenom) -> String {
@@ -138,29 +138,11 @@ mod sealed {
}
}
fn cosmos_decimal_inner_getter(val: &CosmosDecimal) -> u64 {
// haha, this code is so disgusting. I'll make a PR on cosmrs to slightly alleviate those issues...
// note: unwrap here is fine as the to_string is just returning a stringified u64 which, well, is a valid u64
val.to_string().parse().unwrap()
}
// at the time of writing it the current cosmrs' Decimal is extremely limited...
#[derive(Serialize, Deserialize)]
#[serde(remote = "CosmosDecimal")]
struct Decimal(#[serde(getter = "cosmos_decimal_inner_getter")] u64);
impl From<Decimal> for CosmosDecimal {
fn from(val: Decimal) -> Self {
val.0.into()
}
}
#[derive(Serialize, Deserialize, Clone)]
struct Coin {
#[serde(with = "Denom")]
denom: CosmosDenom,
#[serde(with = "Decimal")]
amount: CosmosDecimal,
amount: u128,
}
impl From<Coin> for CosmosCoin {
@@ -42,7 +42,7 @@ pub use cosmrs::tendermint::validator::Info as TendermintValidatorInfo;
pub use cosmrs::tendermint::Time as TendermintTime;
pub use cosmrs::tx::{self, Gas};
pub use cosmrs::Coin as CosmosCoin;
pub use cosmrs::{bip32, AccountId, Decimal, Denom};
pub use cosmrs::{bip32, AccountId, Denom};
pub use cosmwasm_std::Coin as CosmWasmCoin;
pub use fee::{gas_price::GasPrice, GasAdjustable, GasAdjustment};
pub use signing_client::Client as SigningNyxdClient;
+1 -1
View File
@@ -25,7 +25,7 @@ toml = "0.5.6"
url = "2.2"
tap = "1"
cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support" }
cosmrs = "0.8.0"
cosmwasm-std = { version = "1.0.0" }
validator-client = { path = "../client-libs/validator-client", features = ["nyxd-client"] }
+1 -1
View File
@@ -7,7 +7,7 @@ edition = "2021"
[dependencies]
bls12_381 = { version = "0.5", default-features = false, features = ["pairings", "alloc", "experimental"] }
cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support" }
cosmrs = "0.8.0"
thiserror = "1.0"
# I guess temporarily until we get serde support in coconut up and running
+1 -1
View File
@@ -20,7 +20,7 @@ url = "2.2"
ts-rs = "6.1.2"
cosmwasm-std = "1.0.0"
cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support" }
cosmrs = "0.8.0"
validator-client = { path = "../../common/client-libs/validator-client", features = [
"nyxd-client",
+1 -1
View File
@@ -11,7 +11,7 @@ thiserror = "1.0"
k256 = { version = "0.10", features = ["ecdsa", "sha256"] }
eyre = "0.6.5"
cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support" }
cosmrs = "0.8.0"
nym-cli-commands = { path = "../../common/commands" }
validator-client = { path = "../../common/client-libs/validator-client", features = [
+1 -1
View File
@@ -7,7 +7,7 @@ edition = "2021"
[dependencies]
bs58 = "0.4.0"
cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support" }
cosmrs = "0.8.0"
cosmwasm-std = { version = "1.0.0", default-features = false }
getset = "0.1.1"
schemars = { version = "0.8", features = ["preserve_order"] }
+1 -1
View File
@@ -12,7 +12,7 @@ strum = { version = "0.23", features = ["derive"] }
ts-rs = "6.1.2"
cosmwasm-std = "1.0.0-beta8"
cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support" }
cosmrs = "0.8.0"
nym-config = { path = "../../common/config" }
nym-network-defaults = { path = "../../common/network-defaults" }
+1 -1
View File
@@ -52,7 +52,7 @@ base64 = "0.13"
zeroize = "1.4.3"
cosmwasm-std = "1.0.0"
cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support" }
cosmrs = "0.8.0"
validator-client = { path = "../../common/client-libs/validator-client", features = [
"nyxd-client",