From 4b993b045690f27e3fcec06ad1c6bd6714a8b524 Mon Sep 17 00:00:00 2001 From: antiochp <30642645+antiochp@users.noreply.github.com> Date: Thu, 1 Aug 2019 14:50:31 +0100 Subject: [PATCH] rebase against master and compile against kernel_feature_enum_variants branch on grin repo --- Cargo.lock | 74 +++++++++++++++++++------------------------------ util/Cargo.toml | 36 ++++++++++++------------ 2 files changed, 47 insertions(+), 63 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 95656d2c..e4e1a240 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -581,17 +581,16 @@ 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#705fcbb1a62a1cfddb1e8b4fc9c30bab4a388818" 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.28 (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.0.1-beta.1", + "grin_core 2.0.1-beta.1", + "grin_p2p 2.0.1-beta.1", + "grin_pool 2.0.1-beta.1", + "grin_store 2.0.1-beta.1", + "grin_util 2.0.1-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)", @@ -613,7 +612,6 @@ dependencies = [ [[package]] name = "grin_chain" version = "2.0.1-beta.1" -source = "git+https://github.com/mimblewimble/grin#705fcbb1a62a1cfddb1e8b4fc9c30bab4a388818" 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)", @@ -621,10 +619,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.0.1-beta.1", + "grin_keychain 2.0.1-beta.1", + "grin_store 2.0.1-beta.1", + "grin_util 2.0.1-beta.1", "lazy_static 1.3.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)", @@ -636,7 +634,6 @@ dependencies = [ [[package]] name = "grin_core" version = "2.0.1-beta.1" -source = "git+https://github.com/mimblewimble/grin#705fcbb1a62a1cfddb1e8b4fc9c30bab4a388818" 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)", @@ -645,8 +642,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.0.1-beta.1", + "grin_util 2.0.1-beta.1", "lazy_static 1.3.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)", @@ -663,12 +660,11 @@ dependencies = [ [[package]] name = "grin_keychain" version = "2.0.1-beta.1" -source = "git+https://github.com/mimblewimble/grin#705fcbb1a62a1cfddb1e8b4fc9c30bab4a388818" 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.0.1-beta.1", "hmac 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -686,16 +682,15 @@ dependencies = [ [[package]] name = "grin_p2p" version = "2.0.1-beta.1" -source = "git+https://github.com/mimblewimble/grin#705fcbb1a62a1cfddb1e8b4fc9c30bab4a388818" 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.7 (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.0.1-beta.1", + "grin_core 2.0.1-beta.1", + "grin_store 2.0.1-beta.1", + "grin_util 2.0.1-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)", @@ -708,16 +703,15 @@ dependencies = [ [[package]] name = "grin_pool" version = "2.0.1-beta.1" -source = "git+https://github.com/mimblewimble/grin#705fcbb1a62a1cfddb1e8b4fc9c30bab4a388818" dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.7 (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.0.1-beta.1", + "grin_keychain 2.0.1-beta.1", + "grin_store 2.0.1-beta.1", + "grin_util 2.0.1-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.98 (registry+https://github.com/rust-lang/crates.io-index)", @@ -742,15 +736,14 @@ dependencies = [ [[package]] name = "grin_store" version = "2.0.1-beta.1" -source = "git+https://github.com/mimblewimble/grin#705fcbb1a62a1cfddb1e8b4fc9c30bab4a388818" 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.0.1-beta.1", + "grin_util 2.0.1-beta.1", "libc 0.2.60 (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)", @@ -763,7 +756,6 @@ dependencies = [ [[package]] name = "grin_util" version = "2.0.1-beta.1" -source = "git+https://github.com/mimblewimble/grin#705fcbb1a62a1cfddb1e8b4fc9c30bab4a388818" dependencies = [ "backtrace 0.3.34 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -926,12 +918,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.0.1-beta.1", + "grin_chain 2.0.1-beta.1", + "grin_core 2.0.1-beta.1", + "grin_keychain 2.0.1-beta.1", + "grin_store 2.0.1-beta.1", + "grin_util 2.0.1-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.98 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2886,15 +2878,7 @@ dependencies = [ "checksum getrandom 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8e190892c840661957ba9f32dacfb3eb405e657f9f9f60485605f0bb37d6f8" "checksum git2 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8cb400360e8a4d61b10e648285bbfa919bbf9519d0d5d5720354456f44349226" "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_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 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" diff --git a/util/Cargo.toml b/util/Cargo.toml index 2700825a..ddc800bf 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -25,28 +25,28 @@ dirs = "1.0.3" # grin_store = "2.0.0" # For beta release -# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "2.0.0-beta.2" } -# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "2.0.0-beta.2" } -# grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "2.0.0-beta.2" } -# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "2.0.0-beta.2" } -# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "2.0.0-beta.2" } -# grin_store = { git = "https://github.com/mimblewimble/grin", tag = "2.0.0-beta.2" } +# 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" } # 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", version= "2.0.1-beta.1"} -#grin_keychain = { path = "../../grin/keychain", version= "2.0.1-beta.1"} -#grin_chain = { path = "../../grin/chain", version= "2.0.1-beta.1"} -#grin_util = { path = "../../grin/util", version= "2.0.1-beta.1"} -#grin_api = { path = "../../grin/api", version= "2.0.1-beta.1"} -#grin_store = { path = "../../grin/store", version= "2.0.1-beta.1"} +grin_core = { path = "../../grin/core", version= "2.0.1-beta.1"} +grin_keychain = { path = "../../grin/keychain", version= "2.0.1-beta.1"} +grin_chain = { path = "../../grin/chain", version= "2.0.1-beta.1"} +grin_util = { path = "../../grin/util", version= "2.0.1-beta.1"} +grin_api = { path = "../../grin/api", version= "2.0.1-beta.1"} +grin_store = { path = "../../grin/store", version= "2.0.1-beta.1"} [dev-dependencies] pretty_assertions = "0.5.1"