From 25d3ccfe0648bb18e5018c3fa9f7053b2ae8b99e Mon Sep 17 00:00:00 2001 From: Yeastplume Date: Fri, 7 Jun 2019 17:20:31 +0100 Subject: [PATCH] V0/V1 Slate Removal + Grin Header Version Bump (#140) * Remove V0 and V1 Slates from Wallet * rustfmt --- Cargo.lock | 255 +++---- api/src/foreign_rpc.rs | 12 +- api/src/owner_rpc.rs | 16 +- api/tests/slate_versioning.rs | 13 +- libwallet/src/slate.rs | 24 +- libwallet/src/slate_versions/mod.rs | 53 +- libwallet/src/slate_versions/v0.rs | 119 ---- libwallet/src/slate_versions/v1.rs | 382 ---------- libwallet/src/slate_versions/v2.rs | 273 ------- libwallet/tests/slate_versioning.rs | 4 +- libwallet/tests/slates/v0.slate | 1027 -------------------------- libwallet/tests/slates/v1.slate | 1028 --------------------------- src/bin/cmd/wallet_args.rs | 2 +- 13 files changed, 177 insertions(+), 3031 deletions(-) delete mode 100644 libwallet/src/slate_versions/v0.rs delete mode 100644 libwallet/src/slate_versions/v1.rs delete mode 100644 libwallet/tests/slates/v0.slate delete mode 100644 libwallet/tests/slates/v1.slate diff --git a/Cargo.lock b/Cargo.lock index f8b54fd85..d5c4ae7a8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -67,7 +67,7 @@ name = "atty" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -79,13 +79,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "backtrace" -version = "0.3.26" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -95,7 +95,7 @@ version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -138,7 +138,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "bitflags" -version = "1.0.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -219,7 +219,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -229,8 +229,8 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", - "libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", + "libloading 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -240,7 +240,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -253,7 +253,7 @@ name = "cloudabi" version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -283,7 +283,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "croaring-sys 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -293,7 +293,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bindgen 0.37.4 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -364,10 +364,10 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.1.2" +version = "3.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "nix 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -389,7 +389,7 @@ name = "dirs" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -407,7 +407,7 @@ dependencies = [ "easy-jsonrpc-proc-macro 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-core 10.1.0 (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)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -444,7 +444,7 @@ dependencies = [ "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -452,7 +452,7 @@ name = "failure" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.30 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -478,7 +478,7 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -498,7 +498,7 @@ name = "fuchsia-zircon" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -539,8 +539,8 @@ name = "git2" version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "libgit2-sys 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -573,8 +573,8 @@ dependencies = [ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustls 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -588,7 +588,7 @@ name = "grin_chain" version = "2.0.0-beta.1" source = "git+https://github.com/mimblewimble/grin?branch=milestone/2.0.0#7a8a52eda39cd8cd2699c983181131847dd9e846" dependencies = [ - "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "croaring 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -602,8 +602,8 @@ dependencies = [ "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)", "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -626,8 +626,8 @@ dependencies = [ "num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-bigint 0.2.2 (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)", - "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -647,8 +647,8 @@ dependencies = [ "pbkdf2 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "ripemd160 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "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)", @@ -660,7 +660,7 @@ name = "grin_p2p" version = "2.0.0-beta.1" source = "git+https://github.com/mimblewimble/grin?branch=milestone/2.0.0#7a8a52eda39cd8cd2699c983181131847dd9e846" dependencies = [ - "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "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.6 (registry+https://github.com/rust-lang/crates.io-index)", "enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -672,8 +672,8 @@ dependencies = [ "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)", "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)", - "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -692,8 +692,8 @@ dependencies = [ "grin_util 2.0.0-beta.1 (git+https://github.com/mimblewimble/grin?branch=milestone/2.0.0)", "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)", - "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -703,10 +703,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "arrayvec 0.3.25 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -722,12 +722,12 @@ dependencies = [ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "grin_core 2.0.0-beta.1 (git+https://github.com/mimblewimble/grin?branch=milestone/2.0.0)", "grin_util 2.0.0-beta.1 (git+https://github.com/mimblewimble/grin?branch=milestone/2.0.0)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (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)", "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -736,7 +736,7 @@ name = "grin_util" version = "2.0.0-beta.1" source = "git+https://github.com/mimblewimble/grin?branch=milestone/2.0.0#7a8a52eda39cd8cd2699c983181131847dd9e846" dependencies = [ - "backtrace 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.30 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "grin_secp256k1zkp 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -745,8 +745,8 @@ dependencies = [ "log4rs 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.6.4 (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)", - "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "zeroize 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "zip 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -758,7 +758,7 @@ version = "2.0.0-beta.1" 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)", + "ctrlc 3.1.3 (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 2.0.0-beta.1", @@ -799,8 +799,8 @@ dependencies = [ "grin_wallet_util 2.0.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.91 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -824,8 +824,8 @@ dependencies = [ "prettytable-rs 0.7.0 (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)", - "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -850,8 +850,8 @@ dependencies = [ "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)", - "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -872,8 +872,8 @@ dependencies = [ "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)", - "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "strum 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "strum_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -893,14 +893,14 @@ dependencies = [ "grin_util 2.0.0-beta.1 (git+https://github.com/mimblewimble/grin?branch=milestone/2.0.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)", - "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "h2" -version = "0.1.20" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -911,7 +911,7 @@ dependencies = [ "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -963,7 +963,7 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "h2 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", + "h2 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)", "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1019,7 +1019,7 @@ name = "iovec" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1035,8 +1035,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1056,7 +1056,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libc" -version = "0.2.55" +version = "0.2.58" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1065,7 +1065,7 @@ version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1076,12 +1076,12 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "libloading" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1094,7 +1094,7 @@ version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1120,7 +1120,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "liblmdb-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "supercow 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1140,7 +1140,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1159,12 +1159,12 @@ dependencies = [ "flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "log-mdc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "serde-value 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", "thread-id 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1190,7 +1190,7 @@ name = "memchr" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1203,7 +1203,7 @@ name = "memmap" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1218,7 +1218,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1236,7 +1236,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1249,7 +1249,7 @@ dependencies = [ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1263,7 +1263,7 @@ version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1283,8 +1283,8 @@ name = "mortal" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallstr 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "terminfo 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1308,7 +1308,7 @@ version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1319,7 +1319,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1327,13 +1327,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.13.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1483,7 +1483,7 @@ name = "num_cpus" version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1535,7 +1535,7 @@ name = "parking_lot_core" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1547,7 +1547,7 @@ name = "parking_lot_core" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1687,7 +1687,7 @@ name = "rand" version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1697,7 +1697,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1710,7 +1710,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1721,7 +1721,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1776,7 +1776,7 @@ name = "rand_jitter" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1788,7 +1788,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1878,7 +1878,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1898,7 +1898,7 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2003,10 +2003,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "1.0.91" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2015,12 +2015,12 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_derive" -version = "1.0.91" +version = "1.0.92" 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)", @@ -2035,7 +2035,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2045,7 +2045,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2090,8 +2090,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "string" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "strsim" @@ -2146,7 +2149,7 @@ version = "3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2165,7 +2168,7 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2187,7 +2190,7 @@ name = "termion" version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2206,7 +2209,7 @@ name = "thread-id" version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2224,7 +2227,7 @@ name = "time" version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2331,7 +2334,7 @@ dependencies = [ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-sync 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-sync 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2365,7 +2368,7 @@ dependencies = [ [[package]] name = "tokio-sync" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2434,7 +2437,7 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2448,7 +2451,7 @@ name = "toml" version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2545,7 +2548,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2554,7 +2557,7 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "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)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2620,7 +2623,7 @@ name = "which" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2737,13 +2740,13 @@ dependencies = [ "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71" "checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" "checksum autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" -"checksum backtrace 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)" = "1a13fc43f04daf08ab4f71e3d27e1fc27fc437d3e95ac0063a796d92fb40f39b" +"checksum backtrace 0.3.30 (registry+https://github.com/rust-lang/crates.io-index)" = "ada4c783bb7e7443c14e0480f429ae2cc99da95065aeab7ee1b81ada0419404f" "checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6" "checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" "checksum bindgen 0.37.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1b25ab82877ea8fe6ce1ce1f8ac54361f0218bad900af9eb11803994bf67c221" "checksum bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dead7461c1127cf637931a1e50934eb6eee8bff2f74433ac7909e9afcee04a3" "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" -"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" +"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" "checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" "checksum block-buffer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a076c298b9ecdb530ed9d967e74a6027d6a7478924520acddcddc24c1c8ab3ab" "checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39" @@ -2770,7 +2773,7 @@ dependencies = [ "checksum crypto-mac 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7afa06d05a046c7a47c3a849907ec303504608c927f4e85f7bfff22b7180d971" "checksum csv 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7ef22b37c7a51c564a365892c012dc0271221fdcc64c69b19ba4d6fa8bd96d9c" "checksum ct-logs 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "95a4bf5107667e12bf6ce31a3a5066d67acc88942b6742117a41198734aaccaa" -"checksum ctrlc 3.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5531b7f0698d9220b4729f8811931dbe0e91a05be2f7b3245fdc50dd856bae26" +"checksum ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7dfd2d8b4c82121dfdff120f818e09fc4380b0b7e17a742081a89b94853e87f" "checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" "checksum digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90" "checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" @@ -2803,7 +2806,7 @@ dependencies = [ "checksum grin_secp256k1zkp 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "75e9a265f3eeea4c204470f7262e2c6fe18f3d8ddf5fb24340cb550ac4f909c5" "checksum grin_store 2.0.0-beta.1 (git+https://github.com/mimblewimble/grin?branch=milestone/2.0.0)" = "" "checksum grin_util 2.0.0-beta.1 (git+https://github.com/mimblewimble/grin?branch=milestone/2.0.0)" = "" -"checksum h2 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "2b53def7bb0253af7718036fe9338c15defd209136819464384f3a553e07481b" +"checksum h2 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)" = "1e42e3daed5a7e17b12a0c23b5b2fbff23a925a570938ebee4baca1a9a1a2240" "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" "checksum http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "eed324f0f0daf6ec10c474f150505af2c143f251722bf9dbd1261bd1f2ee2c1a" @@ -2818,10 +2821,10 @@ dependencies = [ "checksum jsonrpc-core 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dc15eef5f8b6bef5ac5f7440a957ff95d036e2f98706947741bfc93d1976db4c" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" -"checksum libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "42914d39aad277d9e176efbdad68acb1d5443ab65afe0e0e4f0d49352a950880" +"checksum libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "6281b86796ba5e4366000be6e9e18bf35580adf9e63fbe2294aadb587613a319" "checksum libgit2-sys 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)" = "48441cb35dc255da8ae72825689a95368bf510659ae1ad55dc4aa88cb1789bf1" "checksum liblmdb-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "feed38a3a580f60bf61aaa067b0ff4123395966839adeaf67258a9e50c4d2e49" -"checksum libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3ad660d7cb8c5822cd83d10897b0f1f1526792737a179e73896152f85b88c2" +"checksum libloading 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a5692f82b51823e27c4118b3e5c0d98aee9be90633ebc71ad12afef380b50219" "checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" "checksum linefeed 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5c2abb5810ef55bb5f5f33b010cc280b3ab877764c902681efc7c8c95628004c" "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" @@ -2845,7 +2848,7 @@ dependencies = [ "checksum mortal 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "26153280e6a955881f761354b130aa7838f9983836f3de438ac0a8f22cfab1ff" "checksum msdos_time 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aad9dfe950c057b1bfe9c1f2aa51583a8468ef2a5baba2ebbe06d775efeb7729" "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" -"checksum nix 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46f0f3210768d796e8fa79ec70ee6af172dacbe7147f5e69be5240a47778302b" +"checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" "checksum nix 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a0d95c5fa8b641c10ad0b8887454ebaafa3c92b5cd5350f8fc693adafd178e7b" "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" "checksum nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05aec50c70fd288702bcd93284a8444607f3292dbdf2a30de5ea5dcdbe72287b" @@ -2925,9 +2928,9 @@ dependencies = [ "checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -"checksum serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)" = "a72e9b96fa45ce22a4bc23da3858dfccfd60acd28a25bcd328a98fdd6bea43fd" +"checksum serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)" = "32746bf0f26eab52f06af0d0aa1984f641341d06d8d673c693871da2d188c9be" "checksum serde-value 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7a663f873dedc4eac1a559d4c6bc0d0b2c34dc5ac4702e105014b8281489e44f" -"checksum serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)" = "101b495b109a3e3ca8c4cbe44cf62391527cdfb6ba15821c5ce80bcd5ea23f9f" +"checksum serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)" = "46a3223d0c9ba936b61c0d2e3e559e3217dbfb8d65d06d26e8b3c25de38bae3e" "checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d" "checksum serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)" = "38b08a9a90e5260fe01c6480ec7c811606df6d3a660415808c3c3fa8ed95b582" "checksum sha2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9eb6be24e4c23a84d7184280d2722f7f2731fcdd4a9d886efbfe4413e4847ea0" @@ -2936,7 +2939,7 @@ dependencies = [ "checksum smallstr 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6aa65bb4d5b2bbc90d36af64e29802f788aa614783fa1d0df011800ddcec6e8e" "checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" -"checksum string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b639411d0b9c738748b5397d5ceba08e648f4f1992231aa859af1a017f31f60b" +"checksum string 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0bbfb8937e38e34c3444ff00afb28b0811d9554f15c5ad64d12b0308d1d1995" "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" "checksum strum 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5d1c33039533f051704951680f1adfd468fd37ac46816ded0d9ee068e60f05f" "checksum strum_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "47cd23f5c7dee395a00fa20135e2ec0fffcdfa151c56182966d7a3261343432e" @@ -2945,7 +2948,7 @@ dependencies = [ "checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" "checksum tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7dc4738f2e68ed2855de5ac9cdbe05c9216773ecde4739b2f095002ab03a13ef" "checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" -"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f" +"checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" "checksum terminfo 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8e51065bafd2abe106b6036483b69d1741f4a1ec56ce8a2378de341637de689e" "checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" @@ -2963,7 +2966,7 @@ dependencies = [ "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" "checksum tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162" -"checksum tokio-sync 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "5b2f843ffdf8d6e1f90bddd48da43f99ab071660cd92b7ec560ef3cdfd7a409a" +"checksum tokio-sync 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2162248ff317e2bc713b261f242b69dbb838b85248ed20bb21df56d60ea4cae7" "checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119" "checksum tokio-threadpool 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72558af20be886ea124595ea0f806dd5703b8958e4705429dd58b3d8231f72f2" "checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e" diff --git a/api/src/foreign_rpc.rs b/api/src/foreign_rpc.rs index f7ae06c0b..9e265a023 100644 --- a/api/src/foreign_rpc.rs +++ b/api/src/foreign_rpc.rs @@ -52,8 +52,6 @@ pub trait ForeignRpc { "Ok": { "foreign_api_version": 2, "supported_slate_versions": [ - "V0", - "V1", "V2" ] } @@ -174,7 +172,7 @@ pub trait ForeignRpc { "version_info": { "orig_version": 2, "version": 2, - "block_header_version": 1 + "block_header_version": 2 } } ] @@ -212,7 +210,7 @@ pub trait ForeignRpc { "version_info": { "version": 2, "orig_version": 2, - "block_header_version": 1 + "block_header_version": 2 }, "num_participants": 2, "id": "0436430c-2b02-624c-2032-570501212b00", @@ -337,7 +335,7 @@ pub trait ForeignRpc { "version_info": { "orig_version": 2, "version": 2, - "block_header_version": 1 + "block_header_version": 2 } } } @@ -370,7 +368,7 @@ pub trait ForeignRpc { "version_info": { "version": 2, "orig_version": 2, - "block_header_version": 1 + "block_header_version": 2 }, "num_participants": 2, "id": "0436430c-2b02-624c-2032-570501212b00", @@ -505,7 +503,7 @@ pub trait ForeignRpc { "version_info": { "orig_version": 2, "version": 2, - "block_header_version": 1 + "block_header_version": 2 } } } diff --git a/api/src/owner_rpc.rs b/api/src/owner_rpc.rs index 5ce710260..6716442d8 100644 --- a/api/src/owner_rpc.rs +++ b/api/src/owner_rpc.rs @@ -391,7 +391,7 @@ pub trait OwnerRpc { "version_info": { "orig_version": 2, "version": 2, - "block_header_version": 1 + "block_header_version": 2 } } } @@ -471,7 +471,7 @@ pub trait OwnerRpc { "version_info": { "orig_version": 2, "version": 2, - "block_header_version": 1 + "block_header_version": 2 } } } @@ -535,7 +535,7 @@ pub trait OwnerRpc { "version_info": { "orig_version": 2, "version": 2, - "block_header_version": 1 + "block_header_version": 2 } }, { @@ -619,7 +619,7 @@ pub trait OwnerRpc { "version_info": { "orig_version": 2, "version": 2, - "block_header_version": 1 + "block_header_version": 2 } } } @@ -688,7 +688,7 @@ pub trait OwnerRpc { "version_info": { "orig_version": 2, "version": 2, - "block_header_version": 1 + "block_header_version": 2 } }, 0 @@ -726,7 +726,7 @@ pub trait OwnerRpc { "version_info": { "version": 2, "orig_version": 2, - "block_header_version": 1 + "block_header_version": 2 }, "num_participants": 2, "id": "0436430c-2b02-624c-2032-570501212b00", @@ -862,7 +862,7 @@ pub trait OwnerRpc { "version_info": { "orig_version": 2, "version": 2, - "block_header_version": 1 + "block_header_version": 2 } } } @@ -1121,7 +1121,7 @@ pub trait OwnerRpc { "version_info": { "orig_version": 2, "version": 2, - "block_header_version": 1 + "block_header_version": 2 } } ] diff --git a/api/tests/slate_versioning.rs b/api/tests/slate_versioning.rs index 51b99ac63..197c1e126 100644 --- a/api/tests/slate_versioning.rs +++ b/api/tests/slate_versioning.rs @@ -12,9 +12,9 @@ // limitations under the License. //! core::libtx specific tests -use grin_wallet_api::foreign_rpc_client; +//use grin_wallet_api::foreign_rpc_client; use grin_wallet_api::run_doctest_foreign; -use grin_wallet_libwallet::{Slate, SlateVersion, VersionedSlate}; +//use grin_wallet_libwallet::VersionedSlate; use serde_json; use serde_json::Value; use tempfile::tempdir; @@ -22,8 +22,8 @@ use tempfile::tempdir; //use grin_wallet_libwallet::slate_versions::v2::SlateV2; // test all slate conversions -#[test] -fn receive_versioned_slate() { +//#[test] +fn _receive_versioned_slate() { // as in doctests, except exercising versioning functionality // by accepting and responding with a V1 slate @@ -65,6 +65,9 @@ fn receive_versioned_slate() { } } +// TODO: Re-introduce on a new slate version + +/* /// call ForeignRpc::receive_tx on vs and return the result fn receive_tx(vs: VersionedSlate) -> VersionedSlate { let dir = tempdir().map_err(|e| format!("{:#?}", e)).unwrap(); @@ -128,4 +131,4 @@ fn version_unchanged() { VersionedSlate::V2(_) => (), } } -} +}*/ diff --git a/libwallet/src/slate.rs b/libwallet/src/slate.rs index 7798dd16d..0965b44a1 100644 --- a/libwallet/src/slate.rs +++ b/libwallet/src/slate.rs @@ -39,8 +39,6 @@ use std::fmt; use std::sync::Arc; use uuid::Uuid; -use crate::slate_versions::v0::SlateV0; -use crate::slate_versions::v1::SlateV1; use crate::slate_versions::v2::{ InputV2, OutputV2, ParticipantDataV2, SlateV2, TransactionBodyV2, TransactionV2, TxKernelV2, VersionCompatInfoV2, @@ -207,20 +205,15 @@ impl Slate { /// Recieve a slate, upgrade it to the latest version internally pub fn deserialize_upgrade(slate_json: &str) -> Result { let version = Slate::parse_slate_version(slate_json)?; - let v2 = match version { + let v2: SlateV2 = match version { 2 => serde_json::from_str(slate_json).context(ErrorKind::SlateDeser)?, - 1 => { - let mut v1: SlateV1 = - serde_json::from_str(slate_json).context(ErrorKind::SlateDeser)?; - v1.orig_version = 1; - SlateV2::from(v1) - } - 0 => { + // left as a reminder + /*0 => { let v0: SlateV0 = serde_json::from_str(slate_json).context(ErrorKind::SlateDeser)?; let v1 = SlateV1::from(v0); SlateV2::from(v1) - } + }*/ _ => return Err(ErrorKind::SlateVersion(version).into()), }; Ok(v2.into()) @@ -681,15 +674,12 @@ impl Serialize for Slate { let v2 = SlateV2::from(self); match self.version_info.orig_version { 2 => v2.serialize(serializer), - 1 => { - let v1 = SlateV1::from(v2); - v1.serialize(serializer) - } - 0 => { + // left as a reminder + /*0 => { let v1 = SlateV1::from(v2); let v0 = SlateV0::from(v1); v0.serialize(serializer) - } + }*/ v => Err(S::Error::custom(format!("Unknown slate version {}", v))), } } diff --git a/libwallet/src/slate_versions/mod.rs b/libwallet/src/slate_versions/mod.rs index 96f66977f..76484cf99 100644 --- a/libwallet/src/slate_versions/mod.rs +++ b/libwallet/src/slate_versions/mod.rs @@ -14,15 +14,12 @@ //! This module contains old slate versions and conversions to the newest slate version //! Used for serialization and deserialization of slates in a backwards compatible way. +//! Versions earlier than V2 are removed for the 2.0.0 release, but versioning code +//! remains for future needs + use crate::slate::Slate; -use crate::slate_versions::v0::SlateV0; -use crate::slate_versions::v1::SlateV1; use crate::slate_versions::v2::SlateV2; -#[allow(missing_docs)] -pub mod v0; -#[allow(missing_docs)] -pub mod v1; #[allow(missing_docs)] pub mod v2; @@ -30,15 +27,11 @@ pub mod v2; pub const CURRENT_SLATE_VERSION: u16 = 2; /// The grin block header this slate is intended to be compatible with -pub const GRIN_BLOCK_HEADER_VERSION: u16 = 1; +pub const GRIN_BLOCK_HEADER_VERSION: u16 = 2; /// Existing versions of the slate #[derive(EnumIter, Serialize, Deserialize, Clone, Debug, PartialEq, PartialOrd, Eq, Ord)] pub enum SlateVersion { - /// V0 - V0, - /// V1 - V1, /// V2 (most current) V2, } @@ -48,12 +41,8 @@ pub enum SlateVersion { /// Versions are ordered newest to oldest so serde attempts to /// deserialize newer versions first, then falls back to older versions. pub enum VersionedSlate { - /// Current + /// Current (Grin 1.1.0 - 2.x (current)) V2(SlateV2), - /// V1 - Grin 1.0.1 - 1.0.3) - V1(SlateV1), - /// V0 - Grin 1.0.0 - V0(SlateV0), } impl VersionedSlate { @@ -61,8 +50,6 @@ impl VersionedSlate { pub fn version(&self) -> SlateVersion { match *self { VersionedSlate::V2(_) => SlateVersion::V2, - VersionedSlate::V1(_) => SlateVersion::V1, - VersionedSlate::V0(_) => SlateVersion::V0, } } @@ -70,17 +57,14 @@ impl VersionedSlate { pub fn into_version(slate: Slate, version: SlateVersion) -> VersionedSlate { match version { SlateVersion::V2 => VersionedSlate::V2(slate.into()), - SlateVersion::V1 => { - let s = SlateV2::from(slate); - let s = SlateV1::from(s); - VersionedSlate::V1(s) - } - SlateVersion::V0 => { + // Left here as a reminder of what needs to be inserted on + // the release of a new slate + /*SlateVersion::V0 => { let s = SlateV2::from(slate); let s = SlateV1::from(s); let s = SlateV0::from(s); VersionedSlate::V0(s) - } + }*/ } } } @@ -91,18 +75,13 @@ impl From for Slate { VersionedSlate::V2(s) => { let s = SlateV2::from(s); Slate::from(s) - } - VersionedSlate::V1(s) => { - let s = SlateV1::from(s); - let s = SlateV2::from(s); - Slate::from(s) - } - VersionedSlate::V0(s) => { - let s = SlateV0::from(s); - let s = SlateV1::from(s); - let s = SlateV2::from(s); - Slate::from(s) - } + } // Again, left in as a reminder + /*VersionedSlate::V0(s) => { + let s = SlateV0::from(s); + let s = SlateV1::from(s); + let s = SlateV2::from(s); + Slate::from(s) + }*/ } } } diff --git a/libwallet/src/slate_versions/v0.rs b/libwallet/src/slate_versions/v0.rs deleted file mode 100644 index 4366ca3ca..000000000 --- a/libwallet/src/slate_versions/v0.rs +++ /dev/null @@ -1,119 +0,0 @@ -// Copyright 2018 The Grin Developers -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! Contains V0 of the slate (grin 1.0.0) -//! And methods to downgrade v1 to v0 -use crate::grin_core::core::transaction::{KernelFeatures, OutputFeatures}; -use crate::grin_keychain::BlindingFactor; -use crate::grin_util::secp; -use crate::grin_util::secp::key::PublicKey; -use crate::grin_util::secp::pedersen::{Commitment, RangeProof}; -use crate::grin_util::secp::Signature; -use uuid::Uuid; - -#[derive(Serialize, Deserialize, Debug, Clone)] -pub struct SlateV0 { - /// The number of participants intended to take part in this transaction - pub num_participants: usize, - /// Unique transaction ID, selected by sender - pub id: Uuid, - /// The core transaction data: - /// inputs, outputs, kernels, kernel offset - pub tx: TransactionV0, - /// base amount (excluding fee) - pub amount: u64, - /// fee amount - pub fee: u64, - /// Block height for the transaction - pub height: u64, - /// Lock height - pub lock_height: u64, - /// Participant data, each participant in the transaction will - /// insert their public data here. For now, 0 is sender and 1 - /// is receiver, though this will change for multi-party - pub participant_data: Vec, -} - -#[derive(Serialize, Deserialize, Debug, Clone)] -pub struct ParticipantDataV0 { - /// Id of participant in the transaction. (For now, 0=sender, 1=rec) - pub id: u64, - /// Public key corresponding to private blinding factor - pub public_blind_excess: PublicKey, - /// Public key corresponding to private nonce - pub public_nonce: PublicKey, - /// Public partial signature - pub part_sig: Option, - /// A message for other participants - pub message: Option, - /// Signature, created with private key corresponding to 'public_blind_excess' - pub message_sig: Option, -} - -/// A transaction -#[derive(Serialize, Deserialize, Debug, Clone)] -pub struct TransactionV0 { - /// The kernel "offset" k2 - /// excess is k1G after splitting the key k = k1 + k2 - pub offset: BlindingFactor, - /// The transaction body - inputs/outputs/kernels - pub body: TransactionBodyV0, -} - -/// TransactionBody is a common abstraction for transaction and block -#[derive(Serialize, Deserialize, Debug, Clone)] -pub struct TransactionBodyV0 { - /// List of inputs spent by the transaction. - pub inputs: Vec, - /// List of outputs the transaction produces. - pub outputs: Vec, - /// List of kernels that make up this transaction (usually a single kernel). - pub kernels: Vec, -} -#[derive(Serialize, Deserialize, Debug, Clone)] -pub struct InputV0 { - /// The features of the output being spent. - /// We will check maturity for coinbase output. - pub features: OutputFeatures, - /// The commit referencing the output being spent. - pub commit: Commitment, -} - -#[derive(Debug, Copy, Clone, Serialize, Deserialize)] -pub struct OutputV0 { - /// Options for an output's structure or use - pub features: OutputFeatures, - /// The homomorphic commitment representing the output amount - pub commit: Commitment, - /// A proof that the commitment is in the right range - pub proof: RangeProof, -} - -#[derive(Serialize, Deserialize, Debug, Clone)] -pub struct TxKernelV0 { - /// Options for a kernel's structure or use - pub features: KernelFeatures, - /// Fee originally included in the transaction this proof is for. - pub fee: u64, - /// This kernel is not valid earlier than lock_height blocks - /// The max lock_height of all *inputs* to this transaction - pub lock_height: u64, - /// Remainder of the sum of all transaction commitments. If the transaction - /// is well formed, amounts components should sum to zero and the excess - /// is hence a valid public key. - pub excess: Commitment, - /// The signature proving the excess is a valid public key, which signs - /// the transaction fee. - pub excess_sig: secp::Signature, -} diff --git a/libwallet/src/slate_versions/v1.rs b/libwallet/src/slate_versions/v1.rs deleted file mode 100644 index ce3af02d5..000000000 --- a/libwallet/src/slate_versions/v1.rs +++ /dev/null @@ -1,382 +0,0 @@ -// Copyright 2018 The Grin Developers -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! Contains V1 of the slate (grin 1.0.1, 1.0.2) -//! Changes from V0: -//! * Addition of a version field to Slate struct - -use crate::grin_core::core::transaction::{KernelFeatures, OutputFeatures}; -use crate::grin_core::map_vec; -use crate::grin_keychain::BlindingFactor; -use crate::grin_util::secp; -use crate::grin_util::secp::key::PublicKey; -use crate::grin_util::secp::pedersen::{Commitment, RangeProof}; -use crate::grin_util::secp::Signature; -use uuid::Uuid; - -use crate::slate_versions::v0::{ - InputV0, OutputV0, ParticipantDataV0, SlateV0, TransactionBodyV0, TransactionV0, TxKernelV0, -}; - -#[derive(Serialize, Deserialize, Debug, Clone)] -pub struct SlateV1 { - /// The number of participants intended to take part in this transaction - pub num_participants: usize, - /// Unique transaction ID, selected by sender - pub id: Uuid, - /// The core transaction data: - /// inputs, outputs, kernels, kernel offset - pub tx: TransactionV1, - /// base amount (excluding fee) - pub amount: u64, - /// fee amount - pub fee: u64, - /// Block height for the transaction - pub height: u64, - /// Lock height - pub lock_height: u64, - /// Participant data, each participant in the transaction will - /// insert their public data here. For now, 0 is sender and 1 - /// is receiver, though this will change for multi-party - pub participant_data: Vec, - /// Version - pub version: u64, - #[serde(skip)] - pub orig_version: u64, -} - -#[derive(Serialize, Deserialize, Debug, Clone)] -pub struct ParticipantDataV1 { - /// Id of participant in the transaction. (For now, 0=sender, 1=rec) - pub id: u64, - /// Public key corresponding to private blinding factor - pub public_blind_excess: PublicKey, - /// Public key corresponding to private nonce - pub public_nonce: PublicKey, - /// Public partial signature - pub part_sig: Option, - /// A message for other participants - pub message: Option, - /// Signature, created with private key corresponding to 'public_blind_excess' - pub message_sig: Option, -} - -/// A transaction -#[derive(Serialize, Deserialize, Debug, Clone)] -pub struct TransactionV1 { - /// The kernel "offset" k2 - /// excess is k1G after splitting the key k = k1 + k2 - pub offset: BlindingFactor, - /// The transaction body - inputs/outputs/kernels - pub body: TransactionBodyV1, -} - -/// TransactionBody is a common abstraction for transaction and block -#[derive(Serialize, Deserialize, Debug, Clone)] -pub struct TransactionBodyV1 { - /// List of inputs spent by the transaction. - pub inputs: Vec, - /// List of outputs the transaction produces. - pub outputs: Vec, - /// List of kernels that make up this transaction (usually a single kernel). - pub kernels: Vec, -} -#[derive(Serialize, Deserialize, Debug, Clone)] -pub struct InputV1 { - /// The features of the output being spent. - /// We will check maturity for coinbase output. - pub features: OutputFeatures, - /// The commit referencing the output being spent. - pub commit: Commitment, -} - -#[derive(Debug, Copy, Clone, Serialize, Deserialize)] -pub struct OutputV1 { - /// Options for an output's structure or use - pub features: OutputFeatures, - /// The homomorphic commitment representing the output amount - pub commit: Commitment, - /// A proof that the commitment is in the right range - pub proof: RangeProof, -} - -#[derive(Serialize, Deserialize, Debug, Clone)] -pub struct TxKernelV1 { - /// Options for a kernel's structure or use - pub features: KernelFeatures, - /// Fee originally included in the transaction this proof is for. - pub fee: u64, - /// This kernel is not valid earlier than lock_height blocks - /// The max lock_height of all *inputs* to this transaction - pub lock_height: u64, - /// Remainder of the sum of all transaction commitments. If the transaction - /// is well formed, amounts components should sum to zero and the excess - /// is hence a valid public key. - pub excess: Commitment, - /// The signature proving the excess is a valid public key, which signs - /// the transaction fee. - pub excess_sig: secp::Signature, -} - -// V1 to V0 Downgrade Conversion //////////////////////////////////// - -impl From for SlateV0 { - fn from(slate: SlateV1) -> SlateV0 { - let SlateV1 { - num_participants, - id, - tx, - amount, - fee, - height, - lock_height, - participant_data, - version: _, - orig_version: _, - } = slate; - let tx = TransactionV0::from(tx); - let participant_data = map_vec!(participant_data, |data| ParticipantDataV0::from(data)); - SlateV0 { - num_participants, - id, - tx, - amount, - fee, - height, - lock_height, - participant_data, - } - } -} - -impl From<&ParticipantDataV1> for ParticipantDataV0 { - fn from(data: &ParticipantDataV1) -> ParticipantDataV0 { - let ParticipantDataV1 { - id, - public_blind_excess, - public_nonce, - part_sig, - message, - message_sig, - } = data; - let id = *id; - let public_blind_excess = *public_blind_excess; - let public_nonce = *public_nonce; - let part_sig = *part_sig; - let message: Option = message.as_ref().map(|t| String::from(&**t)); - let message_sig = *message_sig; - ParticipantDataV0 { - id, - public_blind_excess, - public_nonce, - part_sig, - message, - message_sig, - } - } -} - -impl From for TransactionV0 { - fn from(tx: TransactionV1) -> TransactionV0 { - let TransactionV1 { offset, body } = tx; - let body = TransactionBodyV0::from(&body); - TransactionV0 { offset, body } - } -} - -impl From<&TransactionBodyV1> for TransactionBodyV0 { - fn from(body: &TransactionBodyV1) -> Self { - let TransactionBodyV1 { - inputs, - outputs, - kernels, - } = body; - - let inputs = map_vec!(inputs, |inp| InputV0::from(inp)); - let outputs = map_vec!(outputs, |out| OutputV0::from(out)); - let kernels = map_vec!(kernels, |kern| TxKernelV0::from(kern)); - TransactionBodyV0 { - inputs, - outputs, - kernels, - } - } -} - -impl From<&InputV1> for InputV0 { - fn from(input: &InputV1) -> InputV0 { - let InputV1 { features, commit } = *input; - InputV0 { features, commit } - } -} - -impl From<&OutputV1> for OutputV0 { - fn from(output: &OutputV1) -> OutputV0 { - let OutputV1 { - features, - commit, - proof, - } = *output; - OutputV0 { - features, - commit, - proof, - } - } -} - -impl From<&TxKernelV1> for TxKernelV0 { - fn from(kernel: &TxKernelV1) -> TxKernelV0 { - let TxKernelV1 { - features, - fee, - lock_height, - excess, - excess_sig, - } = *kernel; - TxKernelV0 { - features, - fee, - lock_height, - excess, - excess_sig, - } - } -} - -// V0 to V1 Upgrade Conversion //////////////////////////////////// - -impl From for SlateV1 { - fn from(slate: SlateV0) -> SlateV1 { - let SlateV0 { - num_participants, - id, - tx, - amount, - fee, - height, - lock_height, - participant_data, - } = slate; - let tx = TransactionV1::from(tx); - let participant_data = map_vec!(participant_data, |data| ParticipantDataV1::from(data)); - SlateV1 { - num_participants, - id, - tx, - amount, - fee, - height, - lock_height, - participant_data, - version: 1, - orig_version: 0, - } - } -} - -impl From<&ParticipantDataV0> for ParticipantDataV1 { - fn from(data: &ParticipantDataV0) -> ParticipantDataV1 { - let ParticipantDataV0 { - id, - public_blind_excess, - public_nonce, - part_sig, - message, - message_sig, - } = data; - let id = *id; - let public_blind_excess = *public_blind_excess; - let public_nonce = *public_nonce; - let part_sig = *part_sig; - let message: Option = message.as_ref().map(|t| String::from(&**t)); - let message_sig = *message_sig; - ParticipantDataV1 { - id, - public_blind_excess, - public_nonce, - part_sig, - message, - message_sig, - } - } -} - -impl From for TransactionV1 { - fn from(tx: TransactionV0) -> TransactionV1 { - let TransactionV0 { offset, body } = tx; - let body = TransactionBodyV1::from(&body); - TransactionV1 { offset, body } - } -} - -impl From<&TransactionBodyV0> for TransactionBodyV1 { - fn from(body: &TransactionBodyV0) -> Self { - let TransactionBodyV0 { - inputs, - outputs, - kernels, - } = body; - - let inputs = map_vec!(inputs, |inp| InputV1::from(inp)); - let outputs = map_vec!(outputs, |out| OutputV1::from(out)); - let kernels = map_vec!(kernels, |kern| TxKernelV1::from(kern)); - TransactionBodyV1 { - inputs, - outputs, - kernels, - } - } -} - -impl From<&InputV0> for InputV1 { - fn from(input: &InputV0) -> InputV1 { - let InputV0 { features, commit } = *input; - InputV1 { features, commit } - } -} - -impl From<&OutputV0> for OutputV1 { - fn from(output: &OutputV0) -> OutputV1 { - let OutputV0 { - features, - commit, - proof, - } = *output; - OutputV1 { - features, - commit, - proof, - } - } -} - -impl From<&TxKernelV0> for TxKernelV1 { - fn from(kernel: &TxKernelV0) -> TxKernelV1 { - let TxKernelV0 { - features, - fee, - lock_height, - excess, - excess_sig, - } = *kernel; - TxKernelV1 { - features, - fee, - lock_height, - excess, - excess_sig, - } - } -} diff --git a/libwallet/src/slate_versions/v2.rs b/libwallet/src/slate_versions/v2.rs index 3643f4c94..336fb896d 100644 --- a/libwallet/src/slate_versions/v2.rs +++ b/libwallet/src/slate_versions/v2.rs @@ -37,7 +37,6 @@ use crate::grin_core::core::transaction::{KernelFeatures, OutputFeatures}; use crate::grin_core::libtx::secp_ser; -use crate::grin_core::map_vec; use crate::grin_keychain::BlindingFactor; use crate::grin_util::secp; use crate::grin_util::secp::key::PublicKey; @@ -45,10 +44,6 @@ use crate::grin_util::secp::pedersen::{Commitment, RangeProof}; use crate::grin_util::secp::Signature; use uuid::Uuid; -use crate::slate_versions::v1::{ - InputV1, OutputV1, ParticipantDataV1, SlateV1, TransactionBodyV1, TransactionV1, TxKernelV1, -}; - #[derive(Serialize, Deserialize, Debug, Clone)] pub struct SlateV2 { /// Versioning info @@ -188,271 +183,3 @@ pub struct TxKernelV2 { #[serde(with = "secp_ser::sig_serde")] pub excess_sig: secp::Signature, } - -// V2 to V1 Downgrade Conversion //////////////////////////////////// - -impl From for SlateV1 { - fn from(slate: SlateV2) -> SlateV1 { - let SlateV2 { - num_participants, - id, - tx, - amount, - fee, - height, - lock_height, - participant_data, - version_info, - } = slate; - let tx = TransactionV1::from(tx); - let version = 1; - let orig_version = version_info.orig_version as u64; - let participant_data = map_vec!(participant_data, |data| ParticipantDataV1::from(data)); - SlateV1 { - num_participants, - id, - tx, - amount, - fee, - height, - lock_height, - participant_data, - version, - orig_version, - } - } -} - -impl From<&ParticipantDataV2> for ParticipantDataV1 { - fn from(data: &ParticipantDataV2) -> ParticipantDataV1 { - let ParticipantDataV2 { - id, - public_blind_excess, - public_nonce, - part_sig, - message, - message_sig, - } = data; - let id = *id; - let public_blind_excess = *public_blind_excess; - let public_nonce = *public_nonce; - let part_sig = *part_sig; - let message: Option = message.as_ref().map(|t| String::from(&**t)); - let message_sig = *message_sig; - ParticipantDataV1 { - id, - public_blind_excess, - public_nonce, - part_sig, - message, - message_sig, - } - } -} - -impl From for TransactionV1 { - fn from(tx: TransactionV2) -> TransactionV1 { - let TransactionV2 { offset, body } = tx; - let body = TransactionBodyV1::from(&body); - /*let transaction = TransactionV2::new(body.inputs, body.outputs, body.kernels); - transaction.with_offset(offset)*/ - TransactionV1 { offset, body } - } -} - -impl From<&TransactionBodyV2> for TransactionBodyV1 { - fn from(body: &TransactionBodyV2) -> Self { - let TransactionBodyV2 { - inputs, - outputs, - kernels, - } = body; - - let inputs = map_vec!(inputs, |inp| InputV1::from(inp)); - let outputs = map_vec!(outputs, |out| OutputV1::from(out)); - let kernels = map_vec!(kernels, |kern| TxKernelV1::from(kern)); - TransactionBodyV1 { - inputs, - outputs, - kernels, - } - } -} - -impl From<&InputV2> for InputV1 { - fn from(input: &InputV2) -> InputV1 { - let InputV2 { features, commit } = *input; - InputV1 { features, commit } - } -} - -impl From<&OutputV2> for OutputV1 { - fn from(output: &OutputV2) -> OutputV1 { - let OutputV2 { - features, - commit, - proof, - } = *output; - OutputV1 { - features, - commit, - proof, - } - } -} - -impl From<&TxKernelV2> for TxKernelV1 { - fn from(kernel: &TxKernelV2) -> TxKernelV1 { - let TxKernelV2 { - features, - fee, - lock_height, - excess, - excess_sig, - } = *kernel; - TxKernelV1 { - features, - fee, - lock_height, - excess, - excess_sig, - } - } -} - -// V1 to V2 Upgrade Conversion //////////////////////////////////// - -impl From for SlateV2 { - fn from(slate: SlateV1) -> SlateV2 { - let SlateV1 { - num_participants, - id, - tx, - amount, - fee, - height, - lock_height, - participant_data, - version: _, - orig_version, - } = slate; - let tx = TransactionV2::from(tx); - let version = 2; - let orig_version = orig_version as u16; - let block_header_version = 1; - let participant_data = map_vec!(participant_data, |data| ParticipantDataV2::from(data)); - let version_info = VersionCompatInfoV2 { - version, - orig_version, - block_header_version, - }; - SlateV2 { - num_participants, - id, - tx, - amount, - fee, - height, - lock_height, - participant_data, - version_info, - } - } -} - -impl From<&ParticipantDataV1> for ParticipantDataV2 { - fn from(data: &ParticipantDataV1) -> ParticipantDataV2 { - let ParticipantDataV1 { - id, - public_blind_excess, - public_nonce, - part_sig, - message, - message_sig, - } = data; - let id = *id; - let public_blind_excess = *public_blind_excess; - let public_nonce = *public_nonce; - let part_sig = *part_sig; - let message: Option = message.as_ref().map(|t| String::from(&**t)); - let message_sig = *message_sig; - ParticipantDataV2 { - id, - public_blind_excess, - public_nonce, - part_sig, - message, - message_sig, - } - } -} - -impl From for TransactionV2 { - fn from(tx: TransactionV1) -> TransactionV2 { - let TransactionV1 { offset, body } = tx; - let body = TransactionBodyV2::from(&body); - /*let transaction = TransactionV2::new(body.inputs, body.outputs, body.kernels); - transaction.with_offset(offset)*/ - TransactionV2 { offset, body } - } -} - -impl From<&TransactionBodyV1> for TransactionBodyV2 { - fn from(body: &TransactionBodyV1) -> Self { - let TransactionBodyV1 { - inputs, - outputs, - kernels, - } = body; - - let inputs = map_vec!(inputs, |inp| InputV2::from(inp)); - let outputs = map_vec!(outputs, |out| OutputV2::from(out)); - let kernels = map_vec!(kernels, |kern| TxKernelV2::from(kern)); - TransactionBodyV2 { - inputs, - outputs, - kernels, - } - } -} - -impl From<&InputV1> for InputV2 { - fn from(input: &InputV1) -> InputV2 { - let InputV1 { features, commit } = *input; - InputV2 { features, commit } - } -} - -impl From<&OutputV1> for OutputV2 { - fn from(output: &OutputV1) -> OutputV2 { - let OutputV1 { - features, - commit, - proof, - } = *output; - OutputV2 { - features, - commit, - proof, - } - } -} - -impl From<&TxKernelV1> for TxKernelV2 { - fn from(kernel: &TxKernelV1) -> TxKernelV2 { - let TxKernelV1 { - features, - fee, - lock_height, - excess, - excess_sig, - } = *kernel; - TxKernelV2 { - features, - fee, - lock_height, - excess, - excess_sig, - } - } -} diff --git a/libwallet/tests/slate_versioning.rs b/libwallet/tests/slate_versioning.rs index 08a0d66a4..df440e577 100644 --- a/libwallet/tests/slate_versioning.rs +++ b/libwallet/tests/slate_versioning.rs @@ -12,9 +12,10 @@ // limitations under the License. //! core::libtx specific tests -use grin_wallet_libwallet::Slate; +//use grin_wallet_libwallet::Slate; // test all slate conversions +/* TODO: Turn back on upon release of new slate version #[test] fn slate_conversions() { // Test V0 to V2 @@ -92,3 +93,4 @@ fn slate_conversions() { assert_eq!(v.unwrap(), 0); println!("v2 -> v0: {}", s); } +*/ diff --git a/libwallet/tests/slates/v0.slate b/libwallet/tests/slates/v0.slate deleted file mode 100644 index c1a19b7d9..000000000 --- a/libwallet/tests/slates/v0.slate +++ /dev/null @@ -1,1027 +0,0 @@ -{ - "num_participants": 2, - "id": "e0c69803-db50-40d9-a968-496e86660cd4", - "tx": { - "offset": [ - 168, - 83, - 175, - 235, - 241, - 93, - 140, - 17, - 31, - 101, - 64, - 89, - 148, - 9, - 69, - 180, - 120, - 44, - 56, - 102, - 3, - 151, - 37, - 119, - 7, - 181, - 62, - 191, - 219, - 64, - 58, - 82 - ], - "body": { - "inputs": [ - { - "features": "Plain", - "commit": [ - 9, - 211, - 4, - 174, - 214, - 48, - 15, - 129, - 36, - 235, - 139, - 45, - 70, - 204, - 30, - 10, - 123, - 122, - 155, - 144, - 66, - 185, - 203, - 53, - 224, - 32, - 221, - 149, - 82, - 223, - 156, - 105, - 124 - ] - }, - { - "features": "Plain", - "commit": [ - 9, - 211, - 204, - 145, - 93, - 195, - 23, - 72, - 93, - 200, - 187, - 245, - 236, - 70, - 105, - 164, - 11, - 185, - 211, - 48, - 12, - 150, - 223, - 51, - 132, - 209, - 22, - 221, - 173, - 73, - 141, - 13, - 177 - ] - } - ], - "outputs": [ - { - "features": "Plain", - "commit": [ - 8, - 211, - 69, - 62, - 181, - 206, - 53, - 161, - 182, - 187, - 194, - 167, - 169, - 175, - 227, - 36, - 131, - 119, - 76, - 1, - 31, - 153, - 117, - 244, - 35, - 147, - 70, - 143, - 165, - 205, - 67, - 73, - 167 - ], - "proof": [ - 219, - 32, - 104, - 52, - 192, - 34, - 238, - 193, - 243, - 70, - 166, - 123, - 87, - 25, - 65, - 241, - 182, - 134, - 122, - 228, - 189, - 129, - 137, - 202, - 6, - 75, - 105, - 11, - 50, - 54, - 126, - 69, - 74, - 74, - 90, - 221, - 81, - 118, - 28, - 71, - 43, - 14, - 9, - 148, - 206, - 127, - 0, - 87, - 139, - 192, - 106, - 231, - 185, - 175, - 223, - 140, - 226, - 17, - 133, - 70, - 119, - 25, - 118, - 217, - 0, - 70, - 66, - 20, - 211, - 184, - 49, - 254, - 116, - 169, - 72, - 118, - 152, - 10, - 146, - 131, - 21, - 175, - 181, - 194, - 175, - 1, - 143, - 93, - 89, - 94, - 86, - 253, - 116, - 6, - 88, - 176, - 196, - 242, - 212, - 244, - 99, - 228, - 1, - 203, - 236, - 39, - 4, - 179, - 16, - 5, - 205, - 141, - 125, - 135, - 69, - 130, - 144, - 163, - 102, - 140, - 194, - 232, - 44, - 43, - 8, - 103, - 217, - 145, - 7, - 37, - 68, - 249, - 232, - 200, - 5, - 5, - 108, - 151, - 255, - 102, - 204, - 5, - 44, - 242, - 169, - 102, - 103, - 104, - 208, - 214, - 138, - 205, - 198, - 234, - 31, - 200, - 15, - 185, - 181, - 230, - 225, - 147, - 102, - 199, - 180, - 154, - 218, - 56, - 179, - 104, - 192, - 195, - 227, - 247, - 57, - 119, - 223, - 0, - 63, - 12, - 103, - 68, - 115, - 123, - 49, - 176, - 88, - 199, - 212, - 226, - 118, - 110, - 151, - 238, - 4, - 20, - 126, - 240, - 75, - 226, - 41, - 6, - 240, - 135, - 132, - 34, - 5, - 129, - 60, - 125, - 129, - 117, - 152, - 198, - 137, - 200, - 64, - 8, - 125, - 53, - 204, - 156, - 233, - 169, - 143, - 82, - 230, - 140, - 102, - 189, - 222, - 5, - 33, - 172, - 248, - 20, - 115, - 126, - 253, - 7, - 38, - 84, - 114, - 143, - 65, - 142, - 100, - 148, - 167, - 235, - 127, - 166, - 48, - 94, - 199, - 213, - 114, - 171, - 185, - 29, - 59, - 250, - 191, - 114, - 21, - 231, - 126, - 12, - 156, - 243, - 55, - 105, - 87, - 47, - 249, - 168, - 103, - 26, - 36, - 224, - 160, - 67, - 2, - 230, - 172, - 92, - 238, - 153, - 40, - 236, - 17, - 215, - 201, - 134, - 30, - 209, - 135, - 24, - 20, - 42, - 21, - 99, - 150, - 121, - 85, - 228, - 40, - 228, - 19, - 76, - 109, - 222, - 136, - 189, - 190, - 161, - 18, - 72, - 174, - 153, - 215, - 132, - 165, - 101, - 146, - 160, - 101, - 18, - 41, - 72, - 178, - 194, - 251, - 139, - 226, - 92, - 17, - 147, - 69, - 185, - 250, - 125, - 178, - 239, - 189, - 252, - 248, - 70, - 233, - 186, - 71, - 239, - 255, - 61, - 0, - 36, - 189, - 185, - 152, - 233, - 59, - 202, - 190, - 26, - 0, - 34, - 43, - 163, - 107, - 136, - 236, - 79, - 124, - 42, - 33, - 81, - 191, - 0, - 178, - 37, - 246, - 161, - 75, - 77, - 230, - 102, - 88, - 218, - 236, - 170, - 33, - 152, - 19, - 245, - 26, - 146, - 57, - 238, - 201, - 97, - 198, - 113, - 49, - 6, - 182, - 76, - 79, - 31, - 248, - 81, - 229, - 71, - 149, - 34, - 14, - 227, - 205, - 197, - 149, - 49, - 240, - 172, - 192, - 80, - 225, - 124, - 132, - 139, - 33, - 185, - 22, - 181, - 113, - 178, - 246, - 176, - 147, - 252, - 206, - 192, - 70, - 88, - 125, - 10, - 23, - 24, - 200, - 43, - 215, - 167, - 142, - 34, - 34, - 63, - 225, - 72, - 77, - 236, - 132, - 24, - 32, - 19, - 153, - 80, - 220, - 232, - 76, - 151, - 101, - 155, - 14, - 172, - 27, - 250, - 95, - 206, - 133, - 213, - 96, - 47, - 72, - 13, - 113, - 77, - 202, - 177, - 69, - 156, - 79, - 41, - 226, - 116, - 107, - 204, - 180, - 73, - 77, - 128, - 9, - 53, - 221, - 198, - 48, - 245, - 50, - 87, - 100, - 159, - 21, - 68, - 112, - 32, - 3, - 165, - 131, - 213, - 84, - 34, - 233, - 87, - 25, - 47, - 174, - 191, - 252, - 184, - 216, - 131, - 236, - 107, - 178, - 19, - 44, - 134, - 36, - 157, - 107, - 80, - 237, - 174, - 132, - 243, - 192, - 104, - 66, - 178, - 113, - 66, - 103, - 36, - 156, - 141, - 245, - 142, - 46, - 220, - 58, - 202, - 105, - 223, - 246, - 110, - 227, - 47, - 181, - 217, - 61, - 185, - 21, - 109, - 243, - 115, - 171, - 81, - 223, - 44, - 9, - 71, - 66, - 81, - 123, - 70, - 255, - 149, - 41, - 140, - 174, - 195, - 70, - 65, - 81, - 234, - 145, - 200, - 168, - 254, - 116, - 187, - 96, - 255, - 185, - 76, - 124, - 151, - 74, - 166, - 203, - 46, - 71, - 221, - 30, - 224, - 95, - 71, - 30, - 45, - 47, - 11, - 85, - 94, - 254, - 23, - 48, - 39, - 105, - 19, - 151, - 96, - 188, - 17, - 12, - 151, - 148, - 83, - 247, - 191, - 171, - 67, - 179, - 243, - 203, - 164, - 217, - 76, - 138, - 94, - 235, - 88, - 38, - 75, - 181, - 193, - 109, - 230, - 172, - 187, - 201, - 197, - 108, - 176, - 105, - 231, - 225, - 172, - 31, - 120, - 56, - 208, - 166, - 66, - 64, - 23, - 184, - 213, - 99 - ] - } - ], - "kernels": [ - { - "features": "HeightLocked", - "fee": 7000000, - "lock_height": 70194, - "excess": [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "excess_sig": [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ] - } - ] - } - }, - "amount": 84825921007, - "fee": 7000000, - "height": 70194, - "lock_height": 70194, - "participant_data": [ - { - "id": 0, - "public_blind_excess": [ - 3, - 145, - 248, - 252, - 116, - 187, - 95, - 244, - 222, - 55, - 51, - 82, - 231, - 222, - 224, - 8, - 96, - 212, - 251, - 120, - 237, - 122, - 153, - 118, - 85, - 133, - 175, - 152, - 13, - 138, - 49, - 198, - 21 - ], - "public_nonce": [ - 2, - 6, - 86, - 44, - 33, - 167, - 243, - 160, - 3, - 98, - 39, - 34, - 238, - 147, - 196, - 236, - 187, - 236, - 234, - 212, - 166, - 173, - 142, - 229, - 217, - 48, - 181, - 28, - 164, - 166, - 202, - 109, - 1 - ], - "part_sig": null, - "message": null, - "message_sig": null - } - ] -} diff --git a/libwallet/tests/slates/v1.slate b/libwallet/tests/slates/v1.slate deleted file mode 100644 index 6d530c5a8..000000000 --- a/libwallet/tests/slates/v1.slate +++ /dev/null @@ -1,1028 +0,0 @@ -{ - "num_participants": 2, - "id": "e0c69803-db50-40d9-a968-496e86660cd4", - "tx": { - "offset": [ - 168, - 83, - 175, - 235, - 241, - 93, - 140, - 17, - 31, - 101, - 64, - 89, - 148, - 9, - 69, - 180, - 120, - 44, - 56, - 102, - 3, - 151, - 37, - 119, - 7, - 181, - 62, - 191, - 219, - 64, - 58, - 82 - ], - "body": { - "inputs": [ - { - "features": "Plain", - "commit": [ - 9, - 211, - 4, - 174, - 214, - 48, - 15, - 129, - 36, - 235, - 139, - 45, - 70, - 204, - 30, - 10, - 123, - 122, - 155, - 144, - 66, - 185, - 203, - 53, - 224, - 32, - 221, - 149, - 82, - 223, - 156, - 105, - 124 - ] - }, - { - "features": "Plain", - "commit": [ - 9, - 211, - 204, - 145, - 93, - 195, - 23, - 72, - 93, - 200, - 187, - 245, - 236, - 70, - 105, - 164, - 11, - 185, - 211, - 48, - 12, - 150, - 223, - 51, - 132, - 209, - 22, - 221, - 173, - 73, - 141, - 13, - 177 - ] - } - ], - "outputs": [ - { - "features": "Plain", - "commit": [ - 8, - 211, - 69, - 62, - 181, - 206, - 53, - 161, - 182, - 187, - 194, - 167, - 169, - 175, - 227, - 36, - 131, - 119, - 76, - 1, - 31, - 153, - 117, - 244, - 35, - 147, - 70, - 143, - 165, - 205, - 67, - 73, - 167 - ], - "proof": [ - 219, - 32, - 104, - 52, - 192, - 34, - 238, - 193, - 243, - 70, - 166, - 123, - 87, - 25, - 65, - 241, - 182, - 134, - 122, - 228, - 189, - 129, - 137, - 202, - 6, - 75, - 105, - 11, - 50, - 54, - 126, - 69, - 74, - 74, - 90, - 221, - 81, - 118, - 28, - 71, - 43, - 14, - 9, - 148, - 206, - 127, - 0, - 87, - 139, - 192, - 106, - 231, - 185, - 175, - 223, - 140, - 226, - 17, - 133, - 70, - 119, - 25, - 118, - 217, - 0, - 70, - 66, - 20, - 211, - 184, - 49, - 254, - 116, - 169, - 72, - 118, - 152, - 10, - 146, - 131, - 21, - 175, - 181, - 194, - 175, - 1, - 143, - 93, - 89, - 94, - 86, - 253, - 116, - 6, - 88, - 176, - 196, - 242, - 212, - 244, - 99, - 228, - 1, - 203, - 236, - 39, - 4, - 179, - 16, - 5, - 205, - 141, - 125, - 135, - 69, - 130, - 144, - 163, - 102, - 140, - 194, - 232, - 44, - 43, - 8, - 103, - 217, - 145, - 7, - 37, - 68, - 249, - 232, - 200, - 5, - 5, - 108, - 151, - 255, - 102, - 204, - 5, - 44, - 242, - 169, - 102, - 103, - 104, - 208, - 214, - 138, - 205, - 198, - 234, - 31, - 200, - 15, - 185, - 181, - 230, - 225, - 147, - 102, - 199, - 180, - 154, - 218, - 56, - 179, - 104, - 192, - 195, - 227, - 247, - 57, - 119, - 223, - 0, - 63, - 12, - 103, - 68, - 115, - 123, - 49, - 176, - 88, - 199, - 212, - 226, - 118, - 110, - 151, - 238, - 4, - 20, - 126, - 240, - 75, - 226, - 41, - 6, - 240, - 135, - 132, - 34, - 5, - 129, - 60, - 125, - 129, - 117, - 152, - 198, - 137, - 200, - 64, - 8, - 125, - 53, - 204, - 156, - 233, - 169, - 143, - 82, - 230, - 140, - 102, - 189, - 222, - 5, - 33, - 172, - 248, - 20, - 115, - 126, - 253, - 7, - 38, - 84, - 114, - 143, - 65, - 142, - 100, - 148, - 167, - 235, - 127, - 166, - 48, - 94, - 199, - 213, - 114, - 171, - 185, - 29, - 59, - 250, - 191, - 114, - 21, - 231, - 126, - 12, - 156, - 243, - 55, - 105, - 87, - 47, - 249, - 168, - 103, - 26, - 36, - 224, - 160, - 67, - 2, - 230, - 172, - 92, - 238, - 153, - 40, - 236, - 17, - 215, - 201, - 134, - 30, - 209, - 135, - 24, - 20, - 42, - 21, - 99, - 150, - 121, - 85, - 228, - 40, - 228, - 19, - 76, - 109, - 222, - 136, - 189, - 190, - 161, - 18, - 72, - 174, - 153, - 215, - 132, - 165, - 101, - 146, - 160, - 101, - 18, - 41, - 72, - 178, - 194, - 251, - 139, - 226, - 92, - 17, - 147, - 69, - 185, - 250, - 125, - 178, - 239, - 189, - 252, - 248, - 70, - 233, - 186, - 71, - 239, - 255, - 61, - 0, - 36, - 189, - 185, - 152, - 233, - 59, - 202, - 190, - 26, - 0, - 34, - 43, - 163, - 107, - 136, - 236, - 79, - 124, - 42, - 33, - 81, - 191, - 0, - 178, - 37, - 246, - 161, - 75, - 77, - 230, - 102, - 88, - 218, - 236, - 170, - 33, - 152, - 19, - 245, - 26, - 146, - 57, - 238, - 201, - 97, - 198, - 113, - 49, - 6, - 182, - 76, - 79, - 31, - 248, - 81, - 229, - 71, - 149, - 34, - 14, - 227, - 205, - 197, - 149, - 49, - 240, - 172, - 192, - 80, - 225, - 124, - 132, - 139, - 33, - 185, - 22, - 181, - 113, - 178, - 246, - 176, - 147, - 252, - 206, - 192, - 70, - 88, - 125, - 10, - 23, - 24, - 200, - 43, - 215, - 167, - 142, - 34, - 34, - 63, - 225, - 72, - 77, - 236, - 132, - 24, - 32, - 19, - 153, - 80, - 220, - 232, - 76, - 151, - 101, - 155, - 14, - 172, - 27, - 250, - 95, - 206, - 133, - 213, - 96, - 47, - 72, - 13, - 113, - 77, - 202, - 177, - 69, - 156, - 79, - 41, - 226, - 116, - 107, - 204, - 180, - 73, - 77, - 128, - 9, - 53, - 221, - 198, - 48, - 245, - 50, - 87, - 100, - 159, - 21, - 68, - 112, - 32, - 3, - 165, - 131, - 213, - 84, - 34, - 233, - 87, - 25, - 47, - 174, - 191, - 252, - 184, - 216, - 131, - 236, - 107, - 178, - 19, - 44, - 134, - 36, - 157, - 107, - 80, - 237, - 174, - 132, - 243, - 192, - 104, - 66, - 178, - 113, - 66, - 103, - 36, - 156, - 141, - 245, - 142, - 46, - 220, - 58, - 202, - 105, - 223, - 246, - 110, - 227, - 47, - 181, - 217, - 61, - 185, - 21, - 109, - 243, - 115, - 171, - 81, - 223, - 44, - 9, - 71, - 66, - 81, - 123, - 70, - 255, - 149, - 41, - 140, - 174, - 195, - 70, - 65, - 81, - 234, - 145, - 200, - 168, - 254, - 116, - 187, - 96, - 255, - 185, - 76, - 124, - 151, - 74, - 166, - 203, - 46, - 71, - 221, - 30, - 224, - 95, - 71, - 30, - 45, - 47, - 11, - 85, - 94, - 254, - 23, - 48, - 39, - 105, - 19, - 151, - 96, - 188, - 17, - 12, - 151, - 148, - 83, - 247, - 191, - 171, - 67, - 179, - 243, - 203, - 164, - 217, - 76, - 138, - 94, - 235, - 88, - 38, - 75, - 181, - 193, - 109, - 230, - 172, - 187, - 201, - 197, - 108, - 176, - 105, - 231, - 225, - 172, - 31, - 120, - 56, - 208, - 166, - 66, - 64, - 23, - 184, - 213, - 99 - ] - } - ], - "kernels": [ - { - "features": "HeightLocked", - "fee": 7000000, - "lock_height": 70194, - "excess": [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "excess_sig": [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ] - } - ] - } - }, - "amount": 84825921007, - "fee": 7000000, - "height": 70194, - "lock_height": 70194, - "participant_data": [ - { - "id": 0, - "public_blind_excess": [ - 3, - 145, - 248, - 252, - 116, - 187, - 95, - 244, - 222, - 55, - 51, - 82, - 231, - 222, - 224, - 8, - 96, - 212, - 251, - 120, - 237, - 122, - 153, - 118, - 85, - 133, - 175, - 152, - 13, - 138, - 49, - 198, - 21 - ], - "public_nonce": [ - 2, - 6, - 86, - 44, - 33, - 167, - 243, - 160, - 3, - 98, - 39, - 34, - 238, - 147, - 196, - 236, - 187, - 236, - 234, - 212, - 166, - 173, - 142, - 229, - 217, - 48, - 181, - 28, - 164, - 166, - 202, - 109, - 1 - ], - "part_sig": null, - "message": null, - "message_sig": null - } - ], - "version": 1 -} diff --git a/src/bin/cmd/wallet_args.rs b/src/bin/cmd/wallet_args.rs index 6e56c6403..3a12f6e90 100644 --- a/src/bin/cmd/wallet_args.rs +++ b/src/bin/cmd/wallet_args.rs @@ -467,7 +467,7 @@ pub fn parse_send_args(args: &ArgMatches) -> Result Some(0), + false => None, } };