nym-connect-android fixes

This commit is contained in:
Jon Häggblad
2023-02-10 14:38:51 +01:00
parent 0b93215941
commit 3d2e7d32d9
3 changed files with 113 additions and 113 deletions
+111 -111
View File
@@ -633,7 +633,6 @@ dependencies = [
"async-trait",
"client-connections",
"config",
"crypto",
"dashmap",
"dirs",
"futures",
@@ -643,8 +642,9 @@ dependencies = [
"humantime-serde",
"log",
"nonexhaustive-delayqueue",
"nym-crypto",
"nym-pemstore",
"nymsphinx",
"pemstore",
"rand 0.7.3",
"serde",
"serde_json",
@@ -718,10 +718,10 @@ dependencies = [
name = "coconut-dkg-common"
version = "0.1.0"
dependencies = [
"contracts-common",
"cosmwasm-std",
"cw-utils",
"multisig-contract-common",
"nym-contracts-common",
"schemars",
"serde",
]
@@ -819,17 +819,6 @@ version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279"
[[package]]
name = "contracts-common"
version = "0.1.0"
dependencies = [
"bs58",
"cosmwasm-std",
"schemars",
"serde",
"thiserror",
]
[[package]]
name = "convert_case"
version = "0.4.0"
@@ -1014,8 +1003,8 @@ dependencies = [
"bls12_381 0.5.0",
"coconut-interface",
"cosmrs",
"crypto",
"nym-api-requests",
"nym-crypto",
"thiserror",
"validator-client",
]
@@ -1055,28 +1044,6 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]]
name = "crypto"
version = "0.1.0"
dependencies = [
"aes 0.8.2",
"blake3",
"bs58",
"cipher 0.4.3",
"ctr 0.9.2",
"digest 0.10.6",
"ed25519-dalek",
"generic-array 0.14.6",
"hkdf 0.12.3",
"hmac 0.12.1",
"nymsphinx-types",
"pemstore",
"rand 0.7.3",
"subtle-encoding",
"thiserror",
"x25519-dalek",
]
[[package]]
name = "crypto-bigint"
version = "0.3.2"
@@ -1488,7 +1455,7 @@ dependencies = [
"ff 0.11.1",
"group 0.11.0",
"lazy_static",
"pemstore",
"nym-pemstore",
"rand 0.8.5",
"rand_chacha 0.3.1",
"rand_core 0.6.4",
@@ -2002,15 +1969,15 @@ dependencies = [
"coconut-interface",
"credential-storage",
"credentials",
"crypto",
"futures",
"gateway-requests",
"getrandom 0.2.8",
"log",
"mobile-storage",
"network-defaults",
"nym-crypto",
"nym-pemstore",
"nymsphinx",
"pemstore",
"rand 0.7.3",
"serde",
"task",
@@ -2034,11 +2001,11 @@ dependencies = [
"bs58",
"coconut-interface",
"credentials",
"crypto",
"futures",
"log",
"nym-crypto",
"nym-pemstore",
"nymsphinx",
"pemstore",
"rand 0.7.3",
"serde",
"serde_json",
@@ -3355,23 +3322,6 @@ dependencies = [
"windows-sys 0.42.0",
]
[[package]]
name = "mixnet-contract-common"
version = "0.1.0"
dependencies = [
"bs58",
"contracts-common",
"cosmwasm-std",
"humantime-serde",
"log",
"schemars",
"serde",
"serde_json",
"serde_repr",
"thiserror",
"time 0.3.17",
]
[[package]]
name = "mobile-storage"
version = "0.1.0"
@@ -3599,7 +3549,7 @@ dependencies = [
"cosmrs",
"cosmwasm-std",
"getset",
"mixnet-contract-common",
"nym-mixnet-contract-common",
"schemars",
"serde",
]
@@ -3613,8 +3563,6 @@ dependencies = [
"chrono",
"client-core",
"config",
"contracts-common",
"crypto",
"dirs",
"eyre",
"fern",
@@ -3624,6 +3572,8 @@ dependencies = [
"log",
"logging",
"nym-api-requests",
"nym-contracts-common",
"nym-crypto",
"nym-socks5-client",
"pretty_env_logger",
"rand 0.8.5",
@@ -3646,6 +3596,63 @@ dependencies = [
"yaml-rust",
]
[[package]]
name = "nym-contracts-common"
version = "0.1.0"
dependencies = [
"bs58",
"cosmwasm-std",
"schemars",
"serde",
"thiserror",
]
[[package]]
name = "nym-crypto"
version = "0.1.0"
dependencies = [
"aes 0.8.2",
"blake3",
"bs58",
"cipher 0.4.3",
"ctr 0.9.2",
"digest 0.10.6",
"ed25519-dalek",
"generic-array 0.14.6",
"hkdf 0.12.3",
"hmac 0.12.1",
"nym-pemstore",
"nymsphinx-types",
"rand 0.7.3",
"subtle-encoding",
"thiserror",
"x25519-dalek",
]
[[package]]
name = "nym-mixnet-contract-common"
version = "0.1.0"
dependencies = [
"bs58",
"cosmwasm-std",
"humantime-serde",
"log",
"nym-contracts-common",
"schemars",
"serde",
"serde_json",
"serde_repr",
"thiserror",
"time 0.3.17",
]
[[package]]
name = "nym-pemstore"
version = "0.1.0"
dependencies = [
"pem",
]
[[package]]
name = "nym-socks5-client"
version = "1.1.8"
@@ -3658,7 +3665,6 @@ dependencies = [
"completions",
"config",
"credentials",
"crypto",
"dirs",
"futures",
"gateway-client",
@@ -3668,9 +3674,10 @@ dependencies = [
"logging",
"mobile-storage",
"network-defaults",
"nym-crypto",
"nym-pemstore",
"nymsphinx",
"ordered-buffer",
"pemstore",
"pin-project",
"pretty_env_logger",
"proxy-helpers",
@@ -3689,6 +3696,32 @@ dependencies = [
"version-checker",
]
[[package]]
name = "nym-vesting-contract"
version = "1.1.3"
dependencies = [
"cosmwasm-std",
"cw-storage-plus",
"nym-contracts-common",
"nym-mixnet-contract-common",
"nym-vesting-contract-common",
"schemars",
"serde",
"thiserror",
"vergen 5.1.17",
]
[[package]]
name = "nym-vesting-contract-common"
version = "0.1.0"
dependencies = [
"cosmwasm-std",
"nym-contracts-common",
"nym-mixnet-contract-common",
"schemars",
"serde",
]
[[package]]
name = "nymcoconut"
version = "0.5.0"
@@ -3701,7 +3734,7 @@ dependencies = [
"getrandom 0.2.8",
"group 0.11.0",
"itertools",
"pemstore",
"nym-pemstore",
"rand 0.8.5",
"serde",
"serde_derive",
@@ -3713,7 +3746,7 @@ dependencies = [
name = "nymsphinx"
version = "0.1.0"
dependencies = [
"crypto",
"nym-crypto",
"nymsphinx-acknowledgements",
"nymsphinx-addressing",
"nymsphinx-anonymous-replies",
@@ -3734,11 +3767,11 @@ dependencies = [
name = "nymsphinx-acknowledgements"
version = "0.1.0"
dependencies = [
"crypto",
"nym-crypto",
"nym-pemstore",
"nymsphinx-addressing",
"nymsphinx-params",
"nymsphinx-types",
"pemstore",
"rand 0.7.3",
"thiserror",
"topology",
@@ -3748,7 +3781,7 @@ dependencies = [
name = "nymsphinx-addressing"
version = "0.1.0"
dependencies = [
"crypto",
"nym-crypto",
"nymsphinx-types",
"serde",
"thiserror",
@@ -3759,7 +3792,7 @@ name = "nymsphinx-anonymous-replies"
version = "0.1.0"
dependencies = [
"bs58",
"crypto",
"nym-crypto",
"nymsphinx-addressing",
"nymsphinx-params",
"nymsphinx-types",
@@ -3786,7 +3819,7 @@ dependencies = [
name = "nymsphinx-cover"
version = "0.1.0"
dependencies = [
"crypto",
"nym-crypto",
"nymsphinx-acknowledgements",
"nymsphinx-addressing",
"nymsphinx-chunking",
@@ -3822,7 +3855,7 @@ dependencies = [
name = "nymsphinx-params"
version = "0.1.0"
dependencies = [
"crypto",
"nym-crypto",
"nymsphinx-types",
"thiserror",
]
@@ -4127,13 +4160,6 @@ dependencies = [
"regex",
]
[[package]]
name = "pemstore"
version = "0.1.0"
dependencies = [
"pem",
]
[[package]]
name = "percent-encoding"
version = "2.2.0"
@@ -6518,9 +6544,9 @@ name = "topology"
version = "0.1.0"
dependencies = [
"bs58",
"crypto",
"log",
"mixnet-contract-common",
"nym-crypto",
"nym-mixnet-contract-common",
"nymsphinx-addressing",
"nymsphinx-types",
"rand 0.7.3",
@@ -6780,7 +6806,6 @@ dependencies = [
"coconut-interface",
"colored 2.0.0",
"config",
"contracts-common",
"cosmrs",
"cosmwasm-std",
"cw3",
@@ -6791,10 +6816,13 @@ dependencies = [
"group-contract-common",
"itertools",
"log",
"mixnet-contract-common",
"multisig-contract-common",
"network-defaults",
"nym-api-requests",
"nym-contracts-common",
"nym-mixnet-contract-common",
"nym-vesting-contract",
"nym-vesting-contract-common",
"prost",
"reqwest",
"serde",
@@ -6803,8 +6831,6 @@ dependencies = [
"thiserror",
"tokio",
"url",
"vesting-contract",
"vesting-contract-common",
]
[[package]]
@@ -6872,32 +6898,6 @@ version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "vesting-contract"
version = "1.1.3"
dependencies = [
"contracts-common",
"cosmwasm-std",
"cw-storage-plus",
"mixnet-contract-common",
"schemars",
"serde",
"thiserror",
"vergen 5.1.17",
"vesting-contract-common",
]
[[package]]
name = "vesting-contract-common"
version = "0.1.0"
dependencies = [
"contracts-common",
"cosmwasm-std",
"mixnet-contract-common",
"schemars",
"serde",
]
[[package]]
name = "vte"
version = "0.10.1"
+1 -1
View File
@@ -48,7 +48,7 @@ yaml-rust = "0.4"
client-core = { path = "../../clients/client-core" }
nym-api-requests = { path = "../../nym-api/nym-api-requests" }
contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common"}
nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common"}
config-common = { path = "../../common/config", package = "config" }
nym-crypto = { path = "../../common/crypto" }
logging = { path = "../../common/logging"}
@@ -4,8 +4,8 @@ use crate::error::Result;
use crate::models::{
DirectoryService, DirectoryServiceProvider, HarbourMasterService, PagedResult,
};
use contracts_common::types::Percent;
use nym_api_requests::models::GatewayBondAnnotated;
use nym_contracts_common::types::Percent;
static SERVICE_PROVIDER_WELLKNOWN_URL: &str =
"https://nymtech.net/.wellknown/connect/service-providers.json";