From aec0239d8774474bec81af81f14101e792d509f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?= Date: Tue, 7 Dec 2021 11:04:32 +0000 Subject: [PATCH] Removed reliance on cosmrs fork (#943) * Removed reliance on cosmrs fork * Removed the accidental optional flag on cosmrs import in the wallet --- Cargo.lock | 4 ++-- common/client-libs/validator-client/Cargo.toml | 2 +- nym-wallet/Cargo.lock | 4 ++-- nym-wallet/src-tauri/Cargo.toml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ca52a87488..c8a157a60f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -868,7 +868,7 @@ dependencies = [ [[package]] name = "cosmos-sdk-proto" version = "0.8.0" -source = "git+https://github.com/jstuczyn/cosmos-rust/?branch=jstuczyn/wasmd-021-update#d8b23881ca833bf9b3284142c4f90b588afc56e3" +source = "git+https://github.com/cosmos/cosmos-rust?rev=e5a1872083abb3d88fa62dda966e7f5408deba58#e5a1872083abb3d88fa62dda966e7f5408deba58" dependencies = [ "prost", "prost-types", @@ -878,7 +878,7 @@ dependencies = [ [[package]] name = "cosmrs" version = "0.3.0" -source = "git+https://github.com/jstuczyn/cosmos-rust/?branch=jstuczyn/wasmd-021-update#d8b23881ca833bf9b3284142c4f90b588afc56e3" +source = "git+https://github.com/cosmos/cosmos-rust?rev=e5a1872083abb3d88fa62dda966e7f5408deba58#e5a1872083abb3d88fa62dda966e7f5408deba58" dependencies = [ "bip32", "cosmos-sdk-proto", diff --git a/common/client-libs/validator-client/Cargo.toml b/common/client-libs/validator-client/Cargo.toml index 3e1ddc40a3..9592e1f823 100644 --- a/common/client-libs/validator-client/Cargo.toml +++ b/common/client-libs/validator-client/Cargo.toml @@ -27,7 +27,7 @@ async-trait = { version = "0.1.51", optional = true } bip39 = { version = "1", features = ["rand"], optional = true } config = { path = "../../config", optional = true } #cosmrs = { version = "0.3", features = ["rpc", "bip32", "cosmwasm"], optional = true } -cosmrs = { git = "https://github.com/jstuczyn/cosmos-rust/", branch="jstuczyn/wasmd-021-update", features = ["rpc", "bip32", "cosmwasm"], optional = true } +cosmrs = { git = "https://github.com/cosmos/cosmos-rust", rev="e5a1872083abb3d88fa62dda966e7f5408deba58", 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 } diff --git a/nym-wallet/Cargo.lock b/nym-wallet/Cargo.lock index a64d4afd51..947c18558e 100644 --- a/nym-wallet/Cargo.lock +++ b/nym-wallet/Cargo.lock @@ -665,7 +665,7 @@ dependencies = [ [[package]] name = "cosmos-sdk-proto" version = "0.8.0" -source = "git+https://github.com/jstuczyn/cosmos-rust/?branch=jstuczyn/wasmd-021-update#a3dbc2b28fc0c117c894df478799dea9f7fbd186" +source = "git+https://github.com/cosmos/cosmos-rust?rev=e5a1872083abb3d88fa62dda966e7f5408deba58#e5a1872083abb3d88fa62dda966e7f5408deba58" dependencies = [ "prost", "prost-types", @@ -675,7 +675,7 @@ dependencies = [ [[package]] name = "cosmrs" version = "0.3.0" -source = "git+https://github.com/jstuczyn/cosmos-rust/?branch=jstuczyn/wasmd-021-update#a3dbc2b28fc0c117c894df478799dea9f7fbd186" +source = "git+https://github.com/cosmos/cosmos-rust?rev=e5a1872083abb3d88fa62dda966e7f5408deba58#e5a1872083abb3d88fa62dda966e7f5408deba58" dependencies = [ "bip32", "cosmos-sdk-proto", diff --git a/nym-wallet/src-tauri/Cargo.toml b/nym-wallet/src-tauri/Cargo.toml index df144355a5..35d05c702b 100644 --- a/nym-wallet/src-tauri/Cargo.toml +++ b/nym-wallet/src-tauri/Cargo.toml @@ -28,7 +28,7 @@ url = "2.0" rand = "0.6.5" -cosmrs = { git = "https://github.com/jstuczyn/cosmos-rust/", branch="jstuczyn/wasmd-021-update", features = ["rpc", "bip32", "cosmwasm"] } +cosmrs = { git = "https://github.com/cosmos/cosmos-rust", rev="e5a1872083abb3d88fa62dda966e7f5408deba58", features = ["rpc", "bip32", "cosmwasm"] } cosmwasm-std = "1.0.0-beta2" validator-client = { path = "../../common/client-libs/validator-client", features = [