From ea4849a05f0df62ad834c91b975a0ab04fda111d Mon Sep 17 00:00:00 2001 From: Yeastplume Date: Wed, 5 Jun 2019 22:35:11 +0100 Subject: [PATCH] fixes and version update for final 1.0.0 build --- Cargo.lock | 184 ++++++++++++++++++-------------- Cargo.toml | 14 +-- api/Cargo.toml | 10 +- config/Cargo.toml | 4 +- controller/Cargo.toml | 12 +-- impls/Cargo.toml | 8 +- impls/src/test_framework/mod.rs | 2 +- libwallet/Cargo.toml | 6 +- libwallet/src/slate.rs | 6 +- util/Cargo.toml | 26 ++--- 10 files changed, 147 insertions(+), 125 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1991a8afd..1d835ae1a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -553,18 +553,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "grin_api" -version = "1.1.0-beta.2" -source = "git+https://github.com/mimblewimble/grin#25a2ee1233d9de3ab68be4e109f0ac0005dd4ed3" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" 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.27 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_chain 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", - "grin_core 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", - "grin_p2p 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", - "grin_pool 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", - "grin_store 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", - "grin_util 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", + "grin_chain 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "grin_core 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "grin_p2p 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "grin_pool 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "grin_store 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "grin_util 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "http 0.1.17 (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)", @@ -585,8 +585,8 @@ dependencies = [ [[package]] name = "grin_chain" -version = "1.1.0-beta.2" -source = "git+https://github.com/mimblewimble/grin#25a2ee1233d9de3ab68be4e109f0ac0005dd4ed3" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -594,10 +594,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 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", - "grin_keychain 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", - "grin_store 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", - "grin_util 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", + "grin_core 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "grin_keychain 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "grin_store 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "grin_util 1.1.0 (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.6 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -608,8 +608,8 @@ dependencies = [ [[package]] name = "grin_core" -version = "1.1.0-beta.2" -source = "git+https://github.com/mimblewimble/grin#25a2ee1233d9de3ab68be4e109f0ac0005dd4ed3" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -618,8 +618,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 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", - "grin_util 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", + "grin_keychain 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "grin_util 1.1.0 (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.6 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -634,13 +634,13 @@ dependencies = [ [[package]] name = "grin_keychain" -version = "1.1.0-beta.2" -source = "git+https://github.com/mimblewimble/grin#25a2ee1233d9de3ab68be4e109f0ac0005dd4ed3" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_util 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", + "grin_util 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "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.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -652,21 +652,22 @@ dependencies = [ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "zeroize 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "grin_p2p" -version = "1.1.0-beta.2" -source = "git+https://github.com/mimblewimble/grin#25a2ee1233d9de3ab68be4e109f0ac0005dd4ed3" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.4 (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.6 (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 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", - "grin_core 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", - "grin_store 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", - "grin_util 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", + "grin_chain 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "grin_core 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "grin_store 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "grin_util 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (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)", @@ -678,17 +679,17 @@ dependencies = [ [[package]] name = "grin_pool" -version = "1.1.0-beta.2" -source = "git+https://github.com/mimblewimble/grin#25a2ee1233d9de3ab68be4e109f0ac0005dd4ed3" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.6 (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 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", - "grin_keychain 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", - "grin_store 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", - "grin_util 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", + "grin_core 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "grin_keychain 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "grin_store 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "grin_util 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (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.91 (registry+https://github.com/rust-lang/crates.io-index)", @@ -711,16 +712,16 @@ dependencies = [ [[package]] name = "grin_store" -version = "1.1.0-beta.2" -source = "git+https://github.com/mimblewimble/grin#25a2ee1233d9de3ab68be4e109f0ac0005dd4ed3" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.1 (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 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", - "grin_util 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", + "grin_core 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "grin_util 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.55 (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.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -732,8 +733,8 @@ dependencies = [ [[package]] name = "grin_util" -version = "1.1.0-beta.2" -source = "git+https://github.com/mimblewimble/grin#25a2ee1233d9de3ab68be4e109f0ac0005dd4ed3" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "backtrace 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -753,19 +754,19 @@ dependencies = [ [[package]] name = "grin_wallet" -version = "1.1.0-beta.4" +version = "1.1.0" dependencies = [ "built 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "ctrlc 3.1.2 (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_wallet_api 1.1.0-beta.4", - "grin_wallet_config 1.1.0-beta.4", - "grin_wallet_controller 1.1.0-beta.4", - "grin_wallet_impls 1.1.0-beta.4", - "grin_wallet_libwallet 1.1.0-beta.4", - "grin_wallet_util 1.1.0-beta.4", + "grin_wallet_api 1.1.0", + "grin_wallet_config 1.1.0", + "grin_wallet_controller 1.1.0", + "grin_wallet_impls 1.1.0", + "grin_wallet_libwallet 1.1.0", + "grin_wallet_util 1.1.0", "linefeed 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "prettytable-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -774,16 +775,16 @@ dependencies = [ [[package]] name = "grin_wallet_api" -version = "1.1.0-beta.4" +version = "1.1.0" dependencies = [ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "easy-jsonrpc 0.5.2 (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_wallet_config 1.1.0-beta.4", - "grin_wallet_impls 1.1.0-beta.4", - "grin_wallet_libwallet 1.1.0-beta.4", - "grin_wallet_util 1.1.0-beta.4", + "grin_wallet_config 1.1.0", + "grin_wallet_impls 1.1.0", + "grin_wallet_libwallet 1.1.0", + "grin_wallet_util 1.1.0", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -792,10 +793,10 @@ dependencies = [ [[package]] name = "grin_wallet_config" -version = "1.1.0-beta.4" +version = "1.1.0" dependencies = [ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_wallet_util 1.1.0-beta.4", + "grin_wallet_util 1.1.0", "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.91 (registry+https://github.com/rust-lang/crates.io-index)", @@ -805,18 +806,18 @@ dependencies = [ [[package]] name = "grin_wallet_controller" -version = "1.1.0-beta.4" +version = "1.1.0" dependencies = [ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "easy-jsonrpc 0.5.2 (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)", "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_wallet_api 1.1.0-beta.4", - "grin_wallet_config 1.1.0-beta.4", - "grin_wallet_impls 1.1.0-beta.4", - "grin_wallet_libwallet 1.1.0-beta.4", - "grin_wallet_util 1.1.0-beta.4", + "grin_wallet_api 1.1.0", + "grin_wallet_config 1.1.0", + "grin_wallet_impls 1.1.0", + "grin_wallet_libwallet 1.1.0", + "grin_wallet_util 1.1.0", "hyper 0.12.19 (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.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -836,16 +837,16 @@ dependencies = [ [[package]] name = "grin_wallet_impls" -version = "1.1.0-beta.4" +version = "1.1.0" dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.6 (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)", "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_wallet_config 1.1.0-beta.4", - "grin_wallet_libwallet 1.1.0-beta.4", - "grin_wallet_util 1.1.0-beta.4", + "grin_wallet_config 1.1.0", + "grin_wallet_libwallet 1.1.0", + "grin_wallet_util 1.1.0", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -860,14 +861,14 @@ dependencies = [ [[package]] name = "grin_wallet_libwallet" -version = "1.1.0-beta.4" +version = "1.1.0" dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.6 (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_wallet_config 1.1.0-beta.4", - "grin_wallet_util 1.1.0-beta.4", + "grin_wallet_config 1.1.0", + "grin_wallet_util 1.1.0", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -881,15 +882,15 @@ dependencies = [ [[package]] name = "grin_wallet_util" -version = "1.1.0-beta.4" +version = "1.1.0" dependencies = [ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "grin_api 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", - "grin_chain 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", - "grin_core 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", - "grin_keychain 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", - "grin_store 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", - "grin_util 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", + "grin_api 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "grin_chain 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "grin_core 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "grin_keychain 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "grin_store 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "grin_util 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "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.91 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2695,6 +2696,25 @@ name = "zeroize" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "zeroize" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "zeroize_derive 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "zeroize_derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", + "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "zip" version = "0.4.2" @@ -2774,15 +2794,15 @@ dependencies = [ "checksum generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d" "checksum git2 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "591f8be1674b421644b6c030969520bc3fa12114d2eb467471982ed3e9584e71" "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" -"checksum grin_api 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)" = "" -"checksum grin_chain 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)" = "" -"checksum grin_core 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)" = "" -"checksum grin_keychain 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)" = "" -"checksum grin_p2p 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)" = "" -"checksum grin_pool 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)" = "" +"checksum grin_api 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9720b56619eb854e6d1ed4221a50cf669f39b7ee7c7519e9bf5bd45872665dea" +"checksum grin_chain 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bfd7dde76b0c0a6da1151d4d14dd19c3dff882f45205ca8c7c348ff37d18a317" +"checksum grin_core 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b08d46a558ba1c6451b343deb2fd607e1829965969bdc9a09417a60e3c615015" +"checksum grin_keychain 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aef5c2b6175877f42052e3095c2dbf0bf6b7136aa0f92398fa7914a6ee6e0d99" +"checksum grin_p2p 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8b7826739d7d3d64d31ff6eda890d4e1efe56f82e53b97613c7c74c85c0fff2" +"checksum grin_pool 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d19f91334fdb70d95164f00dba4b77bf10321740a446ff81223f2bffe4ce417" "checksum grin_secp256k1zkp 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "75e9a265f3eeea4c204470f7262e2c6fe18f3d8ddf5fb24340cb550ac4f909c5" -"checksum grin_store 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)" = "" -"checksum grin_util 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)" = "" +"checksum grin_store 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ac5c8b11f0bbc7ad319e6b5d3a99d96bd4dd96dcfbb093e0cae2499fa19559c" +"checksum grin_util 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7504d23ede1fa7fb48dda4a6996ab8bb2cf4da7ee4c9f5944ab5402ec17eceff" "checksum h2 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "2b53def7bb0253af7718036fe9338c15defd209136819464384f3a553e07481b" "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" @@ -2986,4 +3006,6 @@ dependencies = [ "checksum yaml-rust 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992" "checksum yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d" "checksum zeroize 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8ddfeb6eee2fb3b262ef6e0898a52b7563bb8e0d5955a313b3cf2f808246ea14" +"checksum zeroize 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b60a6c572b91d8ecb0a460950d84fe5b40699edd07d65f73789b31237afc8f66" +"checksum zeroize_derive 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9dac4b660d969bff9c3fe1847a891cacaa8b21dd5f2aae6e0a3e0975aea96431" "checksum zip 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "36b9e08fb518a65cf7e08a1e482573eb87a2f4f8c6619316612a3c1f162fe822" diff --git a/Cargo.toml b/Cargo.toml index 3a6fbbfc2..40a647701 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_wallet" -version = "1.1.0-beta.4" +version = "1.1.0" authors = ["Grin Developers "] description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -29,13 +29,13 @@ prettytable-rs = "0.7" log = "0.4" linefeed = "0.5" -grin_wallet_api = { path = "./api", version = "1.1.0-beta.4" } -grin_wallet_impls = { path = "./impls", version = "1.1.0-beta.4" } -grin_wallet_libwallet = { path = "./libwallet", version = "1.1.0-beta.4" } -grin_wallet_controller = { path = "./controller", version = "1.1.0-beta.4" } -grin_wallet_config = { path = "./config", version = "1.1.0-beta.4" } +grin_wallet_api = { path = "./api", version = "1.1.0" } +grin_wallet_impls = { path = "./impls", version = "1.1.0" } +grin_wallet_libwallet = { path = "./libwallet", version = "1.1.0" } +grin_wallet_controller = { path = "./controller", version = "1.1.0" } +grin_wallet_config = { path = "./config", version = "1.1.0" } -grin_wallet_util = { path = "./util", version = "1.1.0-beta.4" } +grin_wallet_util = { path = "./util", version = "1.1.0" } [build-dependencies] built = "0.3" diff --git a/api/Cargo.toml b/api/Cargo.toml index 4cedccce8..571cbbfac 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_wallet_api" -version = "1.1.0-beta.4" +version = "1.1.0" authors = ["Grin Developers "] description = "Grin Wallet API" license = "Apache-2.0" @@ -18,11 +18,11 @@ serde_json = "1" easy-jsonrpc = "0.5.1" chrono = { version = "0.4.4", features = ["serde"] } -grin_wallet_libwallet = { path = "../libwallet", version = "1.1.0-beta.4" } -grin_wallet_config = { path = "../config", version = "1.1.0-beta.4" } -grin_wallet_impls = { path = "../impls", version = "1.1.0-beta.4" } +grin_wallet_libwallet = { path = "../libwallet", version = "1.1.0" } +grin_wallet_config = { path = "../config", version = "1.1.0" } +grin_wallet_impls = { path = "../impls", version = "1.1.0" } -grin_wallet_util = { path = "../util", version = "1.1.0-beta.4" } +grin_wallet_util = { path = "../util", version = "1.1.0" } [dev-dependencies] serde_json = "1" diff --git a/config/Cargo.toml b/config/Cargo.toml index a69012070..af34723cc 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_wallet_config" -version = "1.1.0-beta.4" +version = "1.1.0" authors = ["Grin Developers "] description = "Configuration for grin wallet , a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -16,7 +16,7 @@ serde_derive = "1" toml = "0.4" dirs = "1.0.3" -grin_wallet_util = { path = "../util", version = "1.1.0-beta.4" } +grin_wallet_util = { path = "../util", version = "1.1.0" } [dev-dependencies] pretty_assertions = "0.5.1" diff --git a/controller/Cargo.toml b/controller/Cargo.toml index ed02206f4..c48857e2d 100644 --- a/controller/Cargo.toml +++ b/controller/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_wallet_controller" -version = "1.1.0-beta.4" +version = "1.1.0" authors = ["Grin Developers "] description = "Controllers for grin wallet instantiation" license = "Apache-2.0" @@ -32,9 +32,9 @@ chrono = { version = "0.4.4", features = ["serde"] } easy-jsonrpc = "0.5.1" lazy_static = "1" -grin_wallet_util = { path = "../util", version = "1.1.0-beta.4" } +grin_wallet_util = { path = "../util", version = "1.1.0" } -grin_wallet_api = { path = "../api", version = "1.1.0-beta.4" } -grin_wallet_impls = { path = "../impls", version = "1.1.0-beta.4" } -grin_wallet_libwallet = { path = "../libwallet", version = "1.1.0-beta.4" } -grin_wallet_config = { path = "../config", version = "1.1.0-beta.4" } +grin_wallet_api = { path = "../api", version = "1.1.0" } +grin_wallet_impls = { path = "../impls", version = "1.1.0" } +grin_wallet_libwallet = { path = "../libwallet", version = "1.1.0" } +grin_wallet_config = { path = "../config", version = "1.1.0" } diff --git a/impls/Cargo.toml b/impls/Cargo.toml index 0abe62482..eb3499ff1 100644 --- a/impls/Cargo.toml +++ b/impls/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_wallet_impls" -version = "1.1.0-beta.4" +version = "1.1.0" authors = ["Grin Developers "] description = "Concrete types derived from libwallet traits" license = "Apache-2.0" @@ -26,7 +26,7 @@ tokio-retry = "0.1" uuid = { version = "0.7", features = ["serde", "v4"] } chrono = { version = "0.4.4", features = ["serde"] } -grin_wallet_util = { path = "../util", version = "1.1.0-beta.4" } +grin_wallet_util = { path = "../util", version = "1.1.0" } -grin_wallet_libwallet = { path = "../libwallet", version = "1.1.0-beta.4" } -grin_wallet_config = { path = "../config", version = "1.1.0-beta.4" } +grin_wallet_libwallet = { path = "../libwallet", version = "1.1.0" } +grin_wallet_config = { path = "../config", version = "1.1.0" } diff --git a/impls/src/test_framework/mod.rs b/impls/src/test_framework/mod.rs index 9aac68292..ca07b8879 100644 --- a/impls/src/test_framework/mod.rs +++ b/impls/src/test_framework/mod.rs @@ -70,7 +70,7 @@ fn get_outputs_by_pmmr_index_local( outputs: outputs .2 .iter() - .map(|x| api::OutputPrintable::from_output(x, chain.clone(), None, true).unwrap()) + .map(|x| api::OutputPrintable::from_output(x, chain.clone(), None, true, false).unwrap()) .collect(), } } diff --git a/libwallet/Cargo.toml b/libwallet/Cargo.toml index 5ca1a2786..0ec93ecd5 100644 --- a/libwallet/Cargo.toml +++ b/libwallet/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_wallet_libwallet" -version = "1.1.0-beta.4" +version = "1.1.0" authors = ["Grin Developers "] description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -25,7 +25,7 @@ lazy_static = "1" strum = "0.15" strum_macros = "0.15" -grin_wallet_util = { path = "../util", version = "1.1.0-beta.4" } +grin_wallet_util = { path = "../util", version = "1.1.0" } [dev-dependencies] -grin_wallet_config = { path = "../config", version = "1.1.0-beta.4" } +grin_wallet_config = { path = "../config", version = "1.1.0" } diff --git a/libwallet/src/slate.rs b/libwallet/src/slate.rs index 0cc284077..7798dd16d 100644 --- a/libwallet/src/slate.rs +++ b/libwallet/src/slate.rs @@ -483,7 +483,7 @@ impl Slate { let blind_offset = keychain.blind_sum( &BlindSum::new() .add_blinding_factor(BlindingFactor::from_secret_key(sec_key.clone())) - .sub_blinding_factor(self.tx.offset), + .sub_blinding_factor(self.tx.offset.clone()), )?; *sec_key = blind_offset.secret_key(&keychain.secp())?; Ok(()) @@ -631,7 +631,7 @@ impl Slate { where K: Keychain, { - let kernel_offset = self.tx.offset; + let kernel_offset = &self.tx.offset; self.check_fees()?; @@ -840,7 +840,7 @@ impl From for TransactionV2 { impl From<&Transaction> for TransactionV2 { fn from(tx: &Transaction) -> TransactionV2 { let Transaction { offset, body } = tx; - let offset = *offset; + let offset = offset.clone(); let body = TransactionBodyV2::from(body); TransactionV2 { offset, body } } diff --git a/util/Cargo.toml b/util/Cargo.toml index a9cdb4f1c..e0ee0bfd8 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_wallet_util" -version = "1.1.0-beta.4" +version = "1.1.0" authors = ["Grin Developers "] description = "Util, for generic utilities and to re-export grin crates" license = "Apache-2.0" @@ -17,12 +17,12 @@ toml = "0.4" dirs = "1.0.3" # For Release -#grin_core = "1.1.0-beta.1" -#grin_keychain = "1.1.0-beta.1" -#grin_chain = "1.1.0-beta.1" -#grin_util = "1.1.0-beta.1" -#grin_api = "1.1.0-beta.1" -#grin_store = "1.1.0-beta.1" +grin_core = "1.1.0" +grin_keychain = "1.1.0" +grin_chain = "1.1.0" +grin_util = "1.1.0" +grin_api = "1.1.0" +grin_store = "1.1.0" # For beta release # grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v1.1.0-beta.2" } @@ -33,12 +33,12 @@ dirs = "1.0.3" # grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v1.1.0-beta.2" } # 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= "1.1.0-beta.2"}