Merge branch 'milestone/2.0.0'

Cargo.toml

@@ -1,18 +1,19 @@
 [package]
 name = "wallet713"
-version = "1.1.1"
+version = "2.0.0-beta.1"
 authors = ["vault713 devs"]
 description = "A wallet that makes it easy to send, store, and swap Grin."
 keywords = [ "grin", "mimblewimble", "rust", "crypto", "cryptocurrency" ]
 license = "Apache-2.0"
 readme = "README.md"
+edition = "2018"
 
 [dependencies]
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 toml = "0.4"
-clap = "2"
+clap = {version = "2", features = ["yaml"]}
 ansi_term = "0.11"
 colored = "1.6"
 ws = { version = "0.8", features = ["nativetls"] }
@@ -35,6 +36,8 @@ prettytable-rs = "0.7"
 gotham = "0.3.0"
 gotham_derive = "0.3.0"
 hyper = "0.12"
+hyper-rustls = "0.14"
+http = "0.1.5"
 mime = "0.3"
 chrono = { version = "0.4.4", features = ["serde"] }
 term = "0.5"
@@ -43,12 +46,12 @@ log = "0.4"
 env_logger = "0.6.0"
 rpassword = "2.1.0"
 url = "1.7"
-parking_lot = {version = "0.6"}
+parking_lot = "0.6"
 semver = "0.9.0"
+easy-jsonrpc = "0.5.2"
 
-grin_api = { git = "https://github.com/mimblewimble/grin" }
-grin_core = { git = "https://github.com/mimblewimble/grin" }
-grin_wallet = { git = "https://github.com/mimblewimble/grin" }
-grin_keychain = { git = "https://github.com/mimblewimble/grin" }
-grin_util = { git = "https://github.com/mimblewimble/grin" }
-grin_store = { git = "https://github.com/mimblewimble/grin" }
+grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v2.0.0" }
+grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v2.0.0" }
+grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v2.0.0" }
+grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v2.0.0" }
+grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v2.0.0" }