From 061a05857156e9e008596d322129dae686d4b751 Mon Sep 17 00:00:00 2001 From: Yeastplume Date: Tue, 24 Sep 2019 15:13:20 +0100 Subject: [PATCH] udpate for beta release (#224) --- Cargo.lock | 134 +++++++++++++++++++++++++++++------------------- util/Cargo.toml | 24 ++++----- 2 files changed, 93 insertions(+), 65 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 04d85ba..f247727 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -594,21 +594,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "grin_api" -version = "2.0.1-beta.1" -source = "git+https://github.com/mimblewimble/grin#95004a4b969585657e53ce44d8f1a9270e27be94" +version = "2.1.0-dev.1" +source = "git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1#ae556a8a2a3772874d03cef3a3e28335944c919a" dependencies = [ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_chain 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", - "grin_core 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", - "grin_p2p 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", - "grin_pool 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", - "grin_store 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", - "grin_util 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", + "grin_chain 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", + "grin_core 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", + "grin_p2p 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", + "grin_pool 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", + "grin_store 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", + "grin_util 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", "http 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.12.19 (registry+https://github.com/rust-lang/crates.io-index)", "hyper-rustls 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper-timeout 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -626,8 +627,8 @@ dependencies = [ [[package]] name = "grin_chain" -version = "2.0.1-beta.1" -source = "git+https://github.com/mimblewimble/grin#95004a4b969585657e53ce44d8f1a9270e27be94" +version = "2.1.0-beta.1" +source = "git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1#ae556a8a2a3772874d03cef3a3e28335944c919a" dependencies = [ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -635,10 +636,10 @@ dependencies = [ "croaring 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_core 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", - "grin_keychain 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", - "grin_store 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", - "grin_util 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", + "grin_core 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", + "grin_keychain 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", + "grin_store 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", + "grin_util 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -649,8 +650,8 @@ dependencies = [ [[package]] name = "grin_core" -version = "2.0.1-beta.1" -source = "git+https://github.com/mimblewimble/grin#95004a4b969585657e53ce44d8f1a9270e27be94" +version = "2.1.0-beta.1" +source = "git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1#ae556a8a2a3772874d03cef3a3e28335944c919a" dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -659,8 +660,8 @@ dependencies = [ "enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_keychain 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", - "grin_util 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", + "grin_keychain 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", + "grin_util 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -676,13 +677,13 @@ dependencies = [ [[package]] name = "grin_keychain" -version = "2.0.1-beta.1" -source = "git+https://github.com/mimblewimble/grin#95004a4b969585657e53ce44d8f1a9270e27be94" +version = "2.1.0-beta.1" +source = "git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1#ae556a8a2a3772874d03cef3a3e28335944c919a" dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_util 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", + "grin_util 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", "hmac 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -699,17 +700,17 @@ dependencies = [ [[package]] name = "grin_p2p" -version = "2.0.1-beta.1" -source = "git+https://github.com/mimblewimble/grin#95004a4b969585657e53ce44d8f1a9270e27be94" +version = "2.1.0-beta.1" +source = "git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1#ae556a8a2a3772874d03cef3a3e28335944c919a" dependencies = [ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_chain 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", - "grin_core 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", - "grin_store 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", - "grin_util 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", + "grin_chain 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", + "grin_core 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", + "grin_store 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", + "grin_util 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", @@ -721,17 +722,17 @@ dependencies = [ [[package]] name = "grin_pool" -version = "2.0.1-beta.1" -source = "git+https://github.com/mimblewimble/grin#95004a4b969585657e53ce44d8f1a9270e27be94" +version = "2.1.0-beta.1" +source = "git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1#ae556a8a2a3772874d03cef3a3e28335944c919a" dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_core 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", - "grin_keychain 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", - "grin_store 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", - "grin_util 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", + "grin_core 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", + "grin_keychain 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", + "grin_store 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", + "grin_util 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.100 (registry+https://github.com/rust-lang/crates.io-index)", @@ -755,16 +756,16 @@ dependencies = [ [[package]] name = "grin_store" -version = "2.0.1-beta.1" -source = "git+https://github.com/mimblewimble/grin#95004a4b969585657e53ce44d8f1a9270e27be94" +version = "2.1.0-beta.1" +source = "git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1#ae556a8a2a3772874d03cef3a3e28335944c919a" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "croaring 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_core 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", - "grin_util 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", + "grin_core 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", + "grin_util 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "lmdb-zero 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -776,8 +777,8 @@ dependencies = [ [[package]] name = "grin_util" -version = "2.0.1-beta.1" -source = "git+https://github.com/mimblewimble/grin#95004a4b969585657e53ce44d8f1a9270e27be94" +version = "2.1.0-beta.1" +source = "git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1#ae556a8a2a3772874d03cef3a3e28335944c919a" dependencies = [ "backtrace 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -941,12 +942,12 @@ name = "grin_wallet_util" version = "2.1.0-beta.1" dependencies = [ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_api 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", - "grin_chain 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", - "grin_core 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", - "grin_keychain 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", - "grin_store 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", - "grin_util 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)", + "grin_api 2.1.0-dev.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", + "grin_chain 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", + "grin_core 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", + "grin_keychain 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", + "grin_store 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", + "grin_util 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)", "pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.100 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1055,6 +1056,20 @@ dependencies = [ "webpki-roots 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "hyper-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.12.19 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io-timeout 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "idna" version = "0.1.5" @@ -2436,6 +2451,17 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "tokio-io-timeout" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "tokio-reactor" version = "0.1.9" @@ -2929,15 +2955,15 @@ dependencies = [ "checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571" "checksum git2 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39f27186fbb5ec67ece9a56990292bc5aed3c3fc51b9b07b0b52446b1dfb4a82" "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" -"checksum grin_api 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)" = "" -"checksum grin_chain 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)" = "" -"checksum grin_core 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)" = "" -"checksum grin_keychain 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)" = "" -"checksum grin_p2p 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)" = "" -"checksum grin_pool 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)" = "" +"checksum grin_api 2.1.0-dev.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)" = "" +"checksum grin_chain 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)" = "" +"checksum grin_core 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)" = "" +"checksum grin_keychain 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)" = "" +"checksum grin_p2p 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)" = "" +"checksum grin_pool 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)" = "" "checksum grin_secp256k1zkp 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)" = "23027a7673df2c2b20fb9589d742ff400a10a9c3e4c769a77e9fa3bd19586822" -"checksum grin_store 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)" = "" -"checksum grin_util 2.0.1-beta.1 (git+https://github.com/mimblewimble/grin)" = "" +"checksum grin_store 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)" = "" +"checksum grin_util 2.1.0-beta.1 (git+https://github.com/mimblewimble/grin?tag=v2.1.0-beta.1)" = "" "checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" "checksum hmac 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "733e1b3ac906631ca01ebb577e9bb0f5e37a454032b9036b5eaea4013ed6f99a" @@ -2946,6 +2972,7 @@ dependencies = [ "checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" "checksum hyper 0.12.19 (registry+https://github.com/rust-lang/crates.io-index)" = "f1ebec079129e43af5e234ef36ee3d7e6085687d145b7ea653b262d16c6b65f1" "checksum hyper-rustls 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "68f2aa6b1681795bf4da8063f718cd23145aa0c9a5143d9787b345aa60d38ee4" +"checksum hyper-timeout 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "16ec7c8e526ed674ce148323e1f2010f76f546fcdca99a2c721e04bc7bf5b6f7" "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" "checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" "checksum indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a61202fbe46c4a951e9404a720a0180bcf3212c750d735cb5c4ba4dc551299f3" @@ -3101,6 +3128,7 @@ dependencies = [ "checksum tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0f27ee0e6db01c5f0b2973824547ce7e637b2ed79b891a9677b0de9bd532b6ac" "checksum tokio-fs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe6dc22b08d6993916647d108a1a7d15b9cd29c4f4496c62b92c45b5041b7af" "checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926" +"checksum tokio-io-timeout 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "135ce81f15cfd7982fac684f9057a1299eebeb79e98a8a709969b9aa51123129" "checksum tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6af16bfac7e112bea8b0442542161bfc41cbfa4466b580bdda7d18cb88b911ce" "checksum tokio-retry 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f05746ae87dca83a2016b4f5dba5b237b897dd12fd324f60afe282112f16969a" "checksum tokio-rustls 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "208d62fa3e015426e3c64039d9d20adf054a3c9b4d9445560f1c41c75bef3eab" diff --git a/util/Cargo.toml b/util/Cargo.toml index 2d739d4..be7094d 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -25,20 +25,20 @@ dirs = "1.0.3" # grin_store = "2.0.0" # For beta release -# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "2.0.1-beta.1" } -# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "2.0.1-beta.1" } -# grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "2.0.1-beta.1" } -# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "2.0.1-beta.1" } -# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "2.0.1-beta.1" } -# grin_store = { git = "https://github.com/mimblewimble/grin", tag = "2.0.1-beta.1" } +grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v2.1.0-beta.1" } +grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v2.1.0-beta.1" } +grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v2.1.0-beta.1" } +grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v2.1.0-beta.1" } +grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v2.1.0-beta.1" } +grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v2.1.0-beta.1" } # For bleeding edge -grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" } -grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" } -grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" } -grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" } -grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" } -grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" } +# grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" } +# grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" } +# grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" } +# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" } +# grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" } +# grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" } # For local testing #grin_core = { path = "../../grin/core"}