Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-01-20 19:11:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cargo Update (#3338)

Browse source
This commit is contained in:
Quentin Le Sceller 2020-06-08 17:15:32 -04:00 committed by GitHub
parent e28e02ecd4
commit 093c500fed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 831 additions and 928 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1687
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

10
Cargo.toml
View file

@ -21,14 +21,14 @@ path = "src/bin/grin.rs"
[dependencies] [dependencies]
blake2-rfc = "0.2" blake2-rfc = "0.2"
chrono = "0.4.4" chrono = "0.4.11"
clap = { version = "2.31", features = ["yaml"] } clap = { version = "2.33", features = ["yaml"] }
ctrlc = { version = "3.1", features = ["termination"] } ctrlc = { version = "3.1", features = ["termination"] }
humansize = "1.1.0" humansize = "1.1.0"
serde = "1" serde = "1"
serde_json = "1" serde_json = "1"
log = "0.4" log = "0.4"
term = "0.5" term = "0.6"
failure = "0.1" failure = "0.1"
failure_derive = "0.1" failure_derive = "0.1"
@ -42,12 +42,12 @@ grin_servers = { path = "./servers", version = "4.0.0-beta.1" }
grin_util = { path = "./util", version = "4.0.0-beta.1" } grin_util = { path = "./util", version = "4.0.0-beta.1" }
[dependencies.cursive] [dependencies.cursive]
version = "0.14" version = "0.15"
default-features = false default-features = false
features = ["pancurses-backend"] features = ["pancurses-backend"]
[build-dependencies] [build-dependencies]
built = "0.3" built = { version = "0.4", features = ["git2"]}
[dev-dependencies] [dev-dependencies]
grin_chain = { path = "./chain", version = "4.0.0-beta.1" } grin_chain = { path = "./chain", version = "4.0.0-beta.1" }

6
api/Cargo.toml
View file

@ -10,7 +10,7 @@ workspace = ".."
edition = "2018" edition = "2018"
[dependencies] [dependencies]
easy-jsonrpc-mw = "0.5.3" easy-jsonrpc-mw = "0.5.4"
failure = "0.1.1" failure = "0.1.1"
failure_derive = "0.1.1" failure_derive = "0.1.1"
hyper = "0.13" hyper = "0.13"
@ -23,12 +23,12 @@ serde_json = "1"
log = "0.4" log = "0.4"
tokio = { version = "0.2", features = ["full"] } tokio = { version = "0.2", features = ["full"] }
tokio-rustls = "0.13" tokio-rustls = "0.13"
http = "0.1.5" http = "0.2"
hyper-rustls = "0.20" hyper-rustls = "0.20"
hyper-timeout = "0.3" hyper-timeout = "0.3"
futures = "0.3" futures = "0.3"
rustls = "0.17" rustls = "0.17"
url = "1.7.0" url = "2.1"
bytes = "0.5" bytes = "0.5"
grin_core = { path = "../core", version = "4.0.0-beta.1" } grin_core = { path = "../core", version = "4.0.0-beta.1" }

4
chain/Cargo.toml
View file

@ -19,7 +19,7 @@ croaring = { version = "0.4.5", package = "croaring-mw", features = ["compat"] }
log = "0.4" log = "0.4"
serde = "1" serde = "1"
serde_derive = "1" serde_derive = "1"
chrono = "0.4.4" chrono = "0.4.11"
lru-cache = "0.1" lru-cache = "0.1"
lazy_static = "1" lazy_static = "1"
@ -29,5 +29,5 @@ grin_store = { path = "../store", version = "4.0.0-beta.1" }
grin_util = { path = "../util", version = "4.0.0-beta.1" } grin_util = { path = "../util", version = "4.0.0-beta.1" }
[dev-dependencies] [dev-dependencies]
env_logger = "0.5" env_logger = "0.7"
rand = "0.6" rand = "0.6"

6
config/Cargo.toml
View file

@ -13,8 +13,8 @@ edition = "2018"
rand = "0.6" rand = "0.6"
serde = "1" serde = "1"
serde_derive = "1" serde_derive = "1"
toml = "0.4" toml = "0.5"
dirs = "1.0.3" dirs = "2.0"
grin_core = { path = "../core", version = "4.0.0-beta.1" } grin_core = { path = "../core", version = "4.0.0-beta.1" }
grin_servers = { path = "../servers", version = "4.0.0-beta.1" } grin_servers = { path = "../servers", version = "4.0.0-beta.1" }
@ -22,4 +22,4 @@ grin_p2p = { path = "../p2p", version = "4.0.0-beta.1" }
grin_util = { path = "../util", version = "4.0.0-beta.1" } grin_util = { path = "../util", version = "4.0.0-beta.1" }
[dev-dependencies] [dev-dependencies]
pretty_assertions = "0.5.1" pretty_assertions = "0.6.1"

6
core/Cargo.toml
View file

@ -23,10 +23,10 @@ num-bigint = "0.2"
rand = "0.6" rand = "0.6"
serde = "1" serde = "1"
serde_derive = "1" serde_derive = "1"
siphasher = "0.2" siphasher = "0.3"
log = "0.4" log = "0.4"
chrono = { version = "0.4.4", features = ["serde"] } chrono = { version = "0.4.11", features = ["serde"] }
zeroize = "0.9" zeroize = { version = "1.1", features =["zeroize_derive"] }
keychain = { package = "grin_keychain", path = "../keychain", version = "4.0.0-beta.1" } keychain = { package = "grin_keychain", path = "../keychain", version = "4.0.0-beta.1" }
util = { package = "grin_util", path = "../util", version = "4.0.0-beta.1" } util = { package = "grin_util", path = "../util", version = "4.0.0-beta.1" }

2
keychain/Cargo.toml
View file

@ -18,7 +18,7 @@ serde = "1"
serde_derive = "1" serde_derive = "1"
serde_json = "1" serde_json = "1"
lazy_static = "1" lazy_static = "1"
zeroize = "0.9" zeroize = { version = "1.1", features =["zeroize_derive"] }
digest = "0.7" digest = "0.7"
hmac = "0.6" hmac = "0.6"

6
p2p/Cargo.toml
View file

@ -13,13 +13,13 @@ edition = "2018"
bitflags = "1" bitflags = "1"
enum_primitive = "0.1" enum_primitive = "0.1"
lru-cache = "0.1" lru-cache = "0.1"
num = "0.1" num = "0.2"
rand = "0.6" rand = "0.6"
serde = "1" serde = "1"
serde_derive = "1" serde_derive = "1"
tempfile = "3.0.5" tempfile = "3.1"
log = "0.4" log = "0.4"
chrono = { version = "0.4.4", features = ["serde"] } chrono = { version = "0.4.11", features = ["serde"] }
grin_core = { path = "../core", version = "4.0.0-beta.1" } grin_core = { path = "../core", version = "4.0.0-beta.1" }
grin_store = { path = "../store", version = "4.0.0-beta.1" } grin_store = { path = "../store", version = "4.0.0-beta.1" }

2
pool/Cargo.toml
View file

@ -15,7 +15,7 @@ rand = "0.6"
serde = "1" serde = "1"
serde_derive = "1" serde_derive = "1"
log = "0.4" log = "0.4"
chrono = "0.4.4" chrono = "0.4.11"
failure = "0.1" failure = "0.1"
failure_derive = "0.1" failure_derive = "0.1"

6
servers/Cargo.toml
View file

@ -14,17 +14,17 @@ hyper = "0.13"
hyper-rustls = "0.20" hyper-rustls = "0.20"
fs2 = "0.4" fs2 = "0.4"
futures = "0.3" futures = "0.3"
http = "0.1" http = "0.2"
lmdb-zero = "0.4.4" lmdb-zero = "0.4.4"
rand = "0.6" rand = "0.6"
serde = "1" serde = "1"
log = "0.4" log = "0.4"
serde_derive = "1" serde_derive = "1"
serde_json = "1" serde_json = "1"
chrono = "0.4.4" chrono = "0.4.11"
tokio = {version = "0.2", features = ["full"] } tokio = {version = "0.2", features = ["full"] }
tokio-util = { version = "0.2", features = ["codec"] } tokio-util = { version = "0.2", features = ["codec"] }
walkdir = "2.2.9" walkdir = "2.3.1"
grin_api = { path = "../api", version = "4.0.0-beta.1" } grin_api = { path = "../api", version = "4.0.0-beta.1" }
grin_chain = { path = "../chain", version = "4.0.0-beta.1" } grin_chain = { path = "../chain", version = "4.0.0-beta.1" }

2
servers/src/common/hooks.rs
View file

@ -202,7 +202,7 @@ impl WebHook {
let https = HttpsConnector::new(); let https = HttpsConnector::new();
let client = Client::builder() let client = Client::builder()
.keep_alive_timeout(keep_alive) .pool_idle_timeout(keep_alive)
.build::<_, hyper::Body>(https); .build::<_, hyper::Body>(https);
WebHook { WebHook {

1
src/bin/tui/ui.rs
View file

@ -30,6 +30,7 @@ use cursive::views::{
CircularFocus, Dialog, LinearLayout, Panel, SelectView, StackView, TextView, ViewRef, CircularFocus, Dialog, LinearLayout, Panel, SelectView, StackView, TextView, ViewRef,
}; };
use cursive::Cursive; use cursive::Cursive;
use cursive::CursiveExt;
use std::sync::mpsc; use std::sync::mpsc;
use std::{thread, time}; use std::{thread, time};

7
src/build/build.rs
View file

@ -17,7 +17,7 @@
use built; use built;
use std::env; use std::env;
use std::path::PathBuf; use std::path::{Path, PathBuf};
use std::process::Command; use std::process::Command;
fn main() { fn main() {
@ -42,10 +42,11 @@ fn main() {
// build and versioning information // build and versioning information
let mut opts = built::Options::default(); let mut opts = built::Options::default();
opts.set_dependencies(true); 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 // don't fail the build if something's missing, may just be cargo release
let _ = built::write_built_file_with_opts( let _ = built::write_built_file_with_opts(
&opts, &opts,
env!("CARGO_MANIFEST_DIR"), Path::new(env!("CARGO_MANIFEST_DIR")),
format!("{}{}", env::var("OUT_DIR").unwrap(), "/built.rs"), Path::new(&out_dir_path),
); );
} }

6
store/Cargo.toml
View file

@ -17,7 +17,7 @@ failure = "0.1"
failure_derive = "0.1" failure_derive = "0.1"
lmdb-zero = "0.4.4" lmdb-zero = "0.4.4"
memmap = "0.7" memmap = "0.7"
tempfile = "3.0.5" tempfile = "3.1"
serde = "1" serde = "1"
serde_derive = "1" serde_derive = "1"
log = "0.4" log = "0.4"
@ -26,7 +26,7 @@ grin_core = { path = "../core", version = "4.0.0-beta.1" }
grin_util = { path = "../util", version = "4.0.0-beta.1" } grin_util = { path = "../util", version = "4.0.0-beta.1" }
[dev-dependencies] [dev-dependencies]
chrono = "0.4.4" chrono = "0.4.11"
rand = "0.6" rand = "0.6"
filetime = "0.2" filetime = "0.2"
env_logger = "0.5" env_logger = "0.7"

8
util/Cargo.toml
View file

@ -11,18 +11,18 @@ edition = "2018"
[dependencies] [dependencies]
backtrace = "0.3" backtrace = "0.3"
base64 = "0.9" base64 = "0.12"
byteorder = "1" byteorder = "1"
lazy_static = "1" lazy_static = "1"
rand = "0.6" rand = "0.6"
serde = "1" serde = "1"
serde_derive = "1" serde_derive = "1"
log4rs = { version = "0.8.1", features = ["rolling_file_appender", "compound_policy", "size_trigger", "fixed_window_roller"] } log4rs = { version = "0.12", features = ["rolling_file_appender", "compound_policy", "size_trigger", "fixed_window_roller"] }
log = "0.4" log = "0.4"
walkdir = "2" walkdir = "2"
zip = { version = "0.5", default-features = false } zip = { version = "0.5", default-features = false }
parking_lot = {version = "0.6"} parking_lot = "0.10"
zeroize = "0.9" zeroize = { version = "1.1", features =["zeroize_derive"] }
[dependencies.grin_secp256k1zkp] [dependencies.grin_secp256k1zkp]
#git = "https://github.com/mimblewimble/rust-secp256k1-zkp" #git = "https://github.com/mimblewimble/rust-secp256k1-zkp"