GRIN/grin-wallet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cargo Update (#426)

Browse Source 
* Cargo update

* Fix easyjsonrpc import

* Cargo update

* Fix compiler warning
This commit is contained in:
Quentin Le Sceller
2020-06-10 12:31:04 -04:00
committed by GitHub
parent fe2880949d
commit 0e817fd1c0
13 changed files with 372 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+302 -344
View File
File diff suppressed because it is too large Load Diff
Cargo.toml
+8 -8
View File
@@ -20,14 +20,14 @@ members = ["api", "config", "controller", "impls", "libwallet", "util"]
exclude = ["integration"]
[dependencies]
clap = { version = "2.31", features = ["yaml"] }
rpassword = "2.0.0"
clap = { version = "2.33", features = ["yaml"] }
rpassword = "4.0"
failure = "0.1"
failure_derive = "0.1"
prettytable-rs = "0.7"
prettytable-rs = "0.8"
log = "0.4"
linefeed = "0.5"
semver = "0.9"
linefeed = "0.6"
semver = "0.10"
rustyline = "6"
lazy_static = "1"
@@ -40,11 +40,11 @@ grin_wallet_config = { path = "./config", version = "4.0.0-beta.1" }
grin_wallet_util = { path = "./util", version = "4.0.0-beta.1" }
[build-dependencies]
built = "0.3"
built = { version = "0.4", features = ["git2"]}
[dev-dependencies]
url = "1.7.2"
url = "2.1"
serde = "1"
serde_derive = "1"
serde_json = "1"
easy-jsonrpc = "0.5.1"
easy-jsonrpc-mw = "0.5.4"
api/Cargo.toml
+7 -7
View File
@@ -13,16 +13,16 @@ edition = "2018"
failure = "0.1"
failure_derive = "0.1"
log = "0.4"
uuid = { version = "0.7", features = ["serde", "v4"] }
uuid = { version = "0.8", features = ["serde", "v4"] }
serde = "1"
rand = "0.5"
rand = "0.6"
serde_derive = "1"
serde_json = "1"
easy-jsonrpc-mw = "0.5.3"
chrono = { version = "0.4.4", features = ["serde"] }
easy-jsonrpc-mw = "0.5.4"
chrono = { version = "0.4.11", features = ["serde"] }
ring = "0.16"
base64 = "0.9"
ed25519-dalek = "1.0.0-pre.1"
base64 = "0.12"
ed25519-dalek = "1.0.0-pre.3"
grin_wallet_libwallet = { path = "../libwallet", version = "4.0.0-beta.1" }
grin_wallet_config = { path = "../config", version = "4.0.0-beta.1" }
@@ -31,4 +31,4 @@ grin_wallet_util = { path = "../util", version = "4.0.0-beta.1" }
[dev-dependencies]
serde_json = "1"
tempfile = "3.0.7"
tempfile = "3.1"
config/Cargo.toml
+4 -4
View File
@@ -10,13 +10,13 @@ workspace = ".."
edition = "2018"
[dependencies]
rand = "0.5"
rand = "0.6"
serde = "1"
serde_derive = "1"
toml = "0.4"
dirs = "1.0.3"
toml = "0.5"
dirs = "2.0"
grin_wallet_util = { path = "../util", version = "4.0.0-beta.1" }
[dev-dependencies]
pretty_assertions = "0.5.1"
pretty_assertions = "0.6"
controller/Cargo.toml
+8 -8
View File
@@ -15,19 +15,19 @@ failure = "0.1"
failure_derive = "0.1"
futures = "0.3"
hyper = "0.13"
rand = "0.5"
rand = "0.7"
serde = "1"
serde_derive = "1"
serde_json = "1"
log = "0.4"
prettytable-rs = "0.7"
prettytable-rs = "0.8"
ring = "0.16"
term = "0.5"
term = "0.6"
tokio = { version = "0.2", features = ["full"] }
uuid = { version = "0.7", features = ["serde", "v4"] }
url = "1.7.0"
chrono = { version = "0.4.4", features = ["serde"] }
easy-jsonrpc-mw = "0.5.3"
uuid = { version = "0.8", features = ["serde", "v4"] }
url = "2.1"
chrono = { version = "0.4.11", features = ["serde"] }
easy-jsonrpc-mw = "0.5.4"
lazy_static = "1"
grin_wallet_util = { path = "../util", version = "4.0.0-beta.1" }
@@ -38,4 +38,4 @@ grin_wallet_libwallet = { path = "../libwallet", version = "4.0.0-beta.1" }
grin_wallet_config = { path = "../config", version = "4.0.0-beta.1" }
[dev-dependencies]
ed25519-dalek = "1.0.0-pre.1"
ed25519-dalek = "1.0.0-pre.3"
controller/src/display.rs
+18 -4
View File
@@ -205,7 +205,10 @@ pub fn txs(
None => "None".to_owned(),
};
let kernel_excess = match t.kernel_excess {
Some(e) => e.0.as_ref().to_hex(),
Some(e) => {
let excess: &[u8] = e.0.as_ref();
excess.to_hex()
}
None => "None".to_owned(),
};
let payment_proof = match t.payment_proof {
@@ -473,7 +476,11 @@ pub fn payment_proof(tx: &TxLogEntry) -> Result<(), Error> {
t.fg(term::color::WHITE).unwrap();
writeln!(t).unwrap();
let receiver_signature = match pp.receiver_signature {
Some(s) => s.to_bytes().as_ref().to_hex(),
Some(s) => {
let sig_bytes = s.to_bytes();
let sig_ref: &[u8] = sig_bytes.as_ref();
sig_ref.to_hex()
}
None => "None".to_owned(),
};
let fee = match tx.fee {
@@ -490,11 +497,18 @@ pub fn payment_proof(tx: &TxLogEntry) -> Result<(), Error> {
};
let sender_signature = match pp.sender_signature {
Some(s) => s.to_bytes().as_ref().to_hex(),
Some(s) => {
let sig_bytes = s.to_bytes();
let sig_ref: &[u8] = sig_bytes.as_ref();
sig_ref.to_hex()
}
None => "None".to_owned(),
};
let kernel_excess = match tx.kernel_excess {
Some(e) => e.0.as_ref().to_hex(),
Some(e) => {
let excess: &[u8] = e.0.as_ref();
excess.to_hex()
}
None => "None".to_owned(),
};
impls/Cargo.toml
+7 -7
View File
@@ -14,32 +14,32 @@ blake2-rfc = "0.2"
failure = "0.1"
failure_derive = "0.1"
futures = "0.3"
rand = "0.5"
rand = "0.6"
serde = "1"
serde_derive = "1"
serde_json = "1"
log = "0.4"
ring = "0.16"
tokio = { version = "0.2", features = ["full"] }
uuid = { version = "0.7", features = ["serde", "v4"] }
chrono = { version = "0.4.4", features = ["serde"] }
uuid = { version = "0.8", features = ["serde", "v4"] }
chrono = { version = "0.4.11", features = ["serde"] }
crossbeam-utils = "0.7"
#http client (copied from grin)
http = "0.1.5"
hyper-rustls = "0.19"
http = "0.2"
hyper-rustls = "0.20"
hyper-timeout = "0.3"
#Socks/Tor
byteorder = "1"
hyper = "0.13"
hyper-socks2-mw = "0.4"
ed25519-dalek = "1.0.0-pre.1"
ed25519-dalek = "1.0.0-pre.3"
x25519-dalek = "0.6"
data-encoding = "2"
regex = "1.3"
timer = "0.2"
sysinfo = "0.9"
sysinfo = "0.14"
grin_wallet_util = { path = "../util", version = "4.0.0-beta.1" }
grin_wallet_config = { path = "../config", version = "4.0.0-beta.1" }
libwallet/Cargo.toml
+7 -7
View File
@@ -14,24 +14,24 @@ edition = "2018"
blake2-rfc = "0.2"
failure = "0.1"
failure_derive = "0.1"
rand = "0.5"
rand = "0.6"
serde = "1"
serde_derive = "1"
serde_json = "1"
log = "0.4"
uuid = { version = "0.7", features = ["serde", "v4"] }
chrono = { version = "0.4.4", features = ["serde"] }
uuid = { version = "0.8", features = ["serde", "v4"] }
chrono = { version = "0.4.11", features = ["serde"] }
lazy_static = "1"
strum = "0.15"
strum_macros = "0.15"
ed25519-dalek = "1.0.0-pre.1"
strum = "0.18"
strum_macros = "0.18"
ed25519-dalek = "1.0.0-pre.3"
x25519-dalek = "0.6"
base64 = "0.9"
regex = "1.3"
sha2 = "0.8"
bs58 = "0.3"
age = "0.4"
curve25519-dalek = "2.0.0"
curve25519-dalek = "2.1"
secrecy = "0.6"
bech32 = "0.7"
byteorder = "1.3"
libwallet/src/internal/tx.rs
+1 -1
View File
@@ -36,7 +36,7 @@ use ed25519_dalek::Signature as DalekSignature;
// static for incrementing test UUIDs
lazy_static! {
static ref SLATE_COUNTER: Mutex<u8> = { Mutex::new(0) };
static ref SLATE_COUNTER: Mutex<u8> = Mutex::new(0);
}
/// Creates a new slate for a transaction, can be called by anyone involved in
src/build/build.rs
+4 -3
View File
@@ -16,7 +16,7 @@
use built;
use std::env;
use std::path::PathBuf;
use std::path::{Path, PathBuf};
use std::process::Command;
fn main() {
@@ -41,10 +41,11 @@ fn main() {
// build and versioning information
let mut opts = built::Options::default();
opts.set_dependencies(true);
let out_dir_path = format!("{}{}", env::var("OUT_DIR").unwrap(), "/built.rs");
// don't fail the build if something's missing, may just be cargo release
let _ = built::write_built_file_with_opts(
&opts,
env!("CARGO_MANIFEST_DIR"),
format!("{}{}", env::var("OUT_DIR").unwrap(), "/built.rs"),
Path::new(env!("CARGO_MANIFEST_DIR")),
Path::new(&out_dir_path),
);
}
src/cli/cli.rs
+1 -1
View File
@@ -42,7 +42,7 @@ const PROMPT: &'static str = "grin-wallet> ";
// static for keeping track of current stdin buffer contents
lazy_static! {
static ref STDIN_CONTENTS: Mutex<String> = { Mutex::new(String::from("")) };
static ref STDIN_CONTENTS: Mutex<String> = Mutex::new(String::from(""));
}
#[macro_export]
tests/common/mod.rs
+2 -2
View File
@@ -365,7 +365,7 @@ where
}
let res = serde_json::from_str(&res).unwrap();
let res = easy_jsonrpc::Response::from_json_response(res).unwrap();
let res = easy_jsonrpc_mw::Response::from_json_response(res).unwrap();
let res = res.outputs.get(&id).unwrap().clone().unwrap();
if res["Err"] != json!(null) {
Ok(Err(WalletAPIReturnError {
@@ -418,7 +418,7 @@ where
code: res["error"]["code"].as_i64().unwrap() as i32,
}));
}
let res = easy_jsonrpc::Response::from_json_response(res).unwrap();
let res = easy_jsonrpc_mw::Response::from_json_response(res).unwrap();
let res = res
.outputs
.get(&(internal_request_id as u64))
util/Cargo.toml
+3 -3
View File
@@ -10,10 +10,10 @@ workspace = ".."
edition = "2018"
[dependencies]
rand = "0.5"
rand = "0.6"
serde = "1"
serde_derive = "1"
ed25519-dalek = "1.0.0-pre.1"
ed25519-dalek = "1.0.0-pre.3"
data-encoding = "2"
sha3 = "0.8"
@@ -51,4 +51,4 @@ grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v4.0.0-beta.
# grin_store = { path = "../../grin/store"}
[dev-dependencies]
pretty_assertions = "0.5.1"
pretty_assertions = "0.6"