From 88fe03e4bb6b0600d3bef242646fa0b6e37a31d4 Mon Sep 17 00:00:00 2001
From: Luna <96448399+DaOneLuna@users.noreply.github.com>
Date: Sun, 30 Jul 2023 19:14:45 -0700
Subject: [PATCH] VdfOutput fix and client updates (#12)

* Version bumps, Fixes parsing error for VDFOutput and client updates

* version 1.0.5 for cargo
---
 bls/Cargo.toml                    |  2 +-
 cli/Cargo.toml                    | 12 ++++++------
 clients/Cargo.toml                | 14 +++++++-------
 clients/src/rpc/mod.rs            |  2 +-
 clients/src/websocket/mod.rs      | 10 +++++-----
 core/Cargo.toml                   |  6 +++---
 core/src/blockchain/vdf_output.rs |  2 +-
 keys/Cargo.toml                   |  6 +++---
 macros/Cargo.toml                 |  2 +-
 proof_of_space/Cargo.toml         |  9 +++++----
 puzzles/Cargo.toml                |  6 +++---
 serialize/Cargo.toml              |  2 +-
 12 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/bls/Cargo.toml b/bls/Cargo.toml
index 110332d..fba9005 100644
--- a/bls/Cargo.toml
+++ b/bls/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dg_xch_bls"
-version = "1.0.4"
+version = "1.0.5"
 edition = "2021"
 authors = ["James Hoerr"]
 description = "IN DEVELOPMENT - BLS12-381 Rust Implementation for dg_xch_utils"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 4dd3d8e..0c3fc6e 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dg_xch_cli"
-version = "1.0.4"
+version = "1.0.5"
 edition = "2021"
 authors = ["James Hoerr"]
 description = "CLI Utilities for the Chia Blockchain"
@@ -12,11 +12,11 @@ repository = "https://github.com/GalactechsLLC/dg_xch_utils/cli"
 bip39 = {version= "2.0.0", features=["rand"] }
 blst = "0.3.7"
 clap = { version = "4.1.1", features = ["derive"] }
-dg_xch_clients = {path = "../clients", version="1.0.4"}
-dg_xch_core = {path = "../core", version = "1.0.4", features = ["paperclip"] }
-dg_xch_keys = {path = "../keys", version="1.0.4"}
-dg_xch_pos = {path = "../proof_of_space", version="1.0.4"}
-dg_xch_puzzles = {path = "../puzzles", version="1.0.4"}
+dg_xch_clients = {path = "../clients", version="1.0.5"}
+dg_xch_core = {path = "../core", version = "1.0.5", features = ["paperclip"] }
+dg_xch_keys = {path = "../keys", version="1.0.5"}
+dg_xch_pos = {path = "../proof_of_space", version="1.0.5"}
+dg_xch_puzzles = {path = "../puzzles", version="1.0.5"}
 lazy_static = "1.4.0"
 log = "0.4.17"
 rayon = "1.7.0"
diff --git a/clients/Cargo.toml b/clients/Cargo.toml
index 5c5d022..1cfb1ca 100644
--- a/clients/Cargo.toml
+++ b/clients/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dg_xch_clients"
-version = "1.0.4"
+version = "1.0.5"
 edition = "2021"
 authors = ["James Hoerr"]
 description = "RPC and Websocket Clients the Chia Blockchain"
@@ -10,19 +10,19 @@ repository = "https://github.com/GalactechsLLC/dg_xch_utils/clients"
 
 [dependencies]
 async-trait = "0.1.58"
-dg_xch_core = {path = "../core", version = "1.0.4", features = ["paperclip"] }
-dg_xch_macros = {path = "../macros", version="1.0.4"}
-dg_xch_pos = {path = "../proof_of_space", version="1.0.4"}
-dg_xch_serialize = {path = "../serialize", version="1.0.4"}
+dg_xch_core = {path = "../core", version = "1.0.5", features = ["paperclip"] }
+dg_xch_macros = {path = "../macros", version="1.0.5"}
+dg_xch_pos = {path = "../proof_of_space", version="1.0.5"}
+dg_xch_serialize = {path = "../serialize", version="1.0.5"}
 futures-util = "0.3.25"
 hyper = {version="0.14.23", features=["full"]}
 log = "0.4.17"
 reqwest = {version="0.11.11", features=["json", "rustls-tls-webpki-roots"]}
-rustls = {version = "0.20.7", features = ["dangerous_configuration"] }
+rustls = {version = "0.21.5", features = ["dangerous_configuration"] }
 rustls-pemfile = "1.0.1"
 serde = { version = "1.0.149", features = ["derive"] }
 serde_json = "1.0.89"
 time = "0.3.21"
 tokio = {version = "1.21.2", features=["rt-multi-thread", "sync", "signal", "macros", "process", "time", "fs", "net"]}
-tokio-tungstenite = {version = "0.18.0", features = ["rustls-tls-webpki-roots", "rustls"] }
+tokio-tungstenite = {version = "0.20.0", features = ["rustls-tls-webpki-roots", "rustls"] }
 uuid = {version="1.2.2", features=["v4"]}
\ No newline at end of file
diff --git a/clients/src/rpc/mod.rs b/clients/src/rpc/mod.rs
index cc28b6f..8105a51 100644
--- a/clients/src/rpc/mod.rs
+++ b/clients/src/rpc/mod.rs
@@ -46,7 +46,7 @@ pub fn get_client(ssl_path: Option<String>) -> Result<Client, Error> {
         let config = ClientConfig::builder()
             .with_safe_defaults()
             .with_custom_certificate_verifier(Arc::new(NoCertificateVerification {}))
-            .with_single_cert(certs, key)
+            .with_client_auth_cert(certs, key)
             .map_err(|e| Error::new(ErrorKind::Other, format!("{:?}", e)))?;
         ClientBuilder::new()
             .use_preconfigured_tls(config)
diff --git a/clients/src/websocket/mod.rs b/clients/src/websocket/mod.rs
index dd9da07..7dcded7 100644
--- a/clients/src/websocket/mod.rs
+++ b/clients/src/websocket/mod.rs
@@ -82,7 +82,7 @@ pub async fn get_client_tls(
         ClientConfig::builder()
             .with_safe_defaults()
             .with_custom_certificate_verifier(Arc::new(NoCertificateVerification {}))
-            .with_single_cert(certs, key)
+            .with_client_auth_cert(certs, key)
             .map_err(|e| Error::new(ErrorKind::Other, format!("Error Building Client: {:?}", e)))?,
     );
 
@@ -113,7 +113,7 @@ pub async fn get_client_tls(
             );
         }
     }
-    let (stream, resp) = connect_async_tls_with_config(request, None, Some(connector))
+    let (stream, resp) = connect_async_tls_with_config(request, None, false, Some(connector))
         .await
         .map_err(|e| {
             Error::new(
@@ -139,7 +139,7 @@ pub async fn get_client_generated_tls(
         ClientConfig::builder()
             .with_safe_defaults()
             .with_custom_certificate_verifier(Arc::new(NoCertificateVerification {}))
-            .with_single_cert(certs, key)
+            .with_client_auth_cert(certs, key)
             .map_err(|e| Error::new(ErrorKind::Other, format!("Error Building Client: {:?}", e)))?,
     );
     let connector = Connector::Rustls(cfg.clone());
@@ -169,7 +169,7 @@ pub async fn get_client_generated_tls(
             );
         }
     }
-    let (stream, resp) = connect_async_tls_with_config(request, None, Some(connector))
+    let (stream, resp) = connect_async_tls_with_config(request, None, false, Some(connector))
         .await
         .map_err(|e| {
             Error::new(
@@ -212,7 +212,7 @@ pub async fn get_client(
             );
         }
     }
-    let (stream, resp) = connect_async_tls_with_config(request, None, None)
+    let (stream, resp) = connect_async_tls_with_config(request, None, false, None)
         .await
         .map_err(|e| Error::new(ErrorKind::Other, e))?;
     debug!("Client Connect Resp: {:?}", resp);
diff --git a/core/Cargo.toml b/core/Cargo.toml
index bc8e7c6..0026b33 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dg_xch_core"
-version = "1.0.4"
+version = "1.0.5"
 edition = "2021"
 authors = ["James Hoerr"]
 description = "Core library containing type/error definitions, CLVM tools, Consensus and Pool definitions"
@@ -14,8 +14,8 @@ bip39 = {version= "2.0.0", features=["rand"] }
 bls12_381 = "0.8.0"
 blst = "0.3.7"
 bytes = "1.4.0"
-dg_xch_macros = {path = "../macros", version="1.0.4"}
-dg_xch_serialize = {path = "../serialize", version="1.0.4"}
+dg_xch_macros = {path = "../macros", version="1.0.5"}
+dg_xch_serialize = {path = "../serialize", version="1.0.5"}
 hex = "0.4.3"
 hkdf = "0.12.3"
 lazy_static = "1.4.0"
diff --git a/core/src/blockchain/vdf_output.rs b/core/src/blockchain/vdf_output.rs
index 78c745a..7f05bf8 100644
--- a/core/src/blockchain/vdf_output.rs
+++ b/core/src/blockchain/vdf_output.rs
@@ -3,5 +3,5 @@ use serde::{Deserialize, Serialize};
 
 #[derive(ChiaSerial, Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
 pub struct VdfOutput {
-    pub data: Vec<u8>,
+    pub data: String,
 }
diff --git a/keys/Cargo.toml b/keys/Cargo.toml
index 06a677f..e82af60 100644
--- a/keys/Cargo.toml
+++ b/keys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dg_xch_keys"
-version = "1.0.4"
+version = "1.0.5"
 edition = "2021"
 authors = ["James Hoerr"]
 description = "Key Management Utils the Chia Blockchain"
@@ -12,7 +12,7 @@ repository = "https://github.com/GalactechsLLC/dg_xch_utils/keys"
 bech32 = "0.9.1"
 blst = "0.3.7"
 bip39 = {version= "2.0.0", features=["rand"] }
-dg_xch_core = {path = "../core", version = "1.0.4", features = ["paperclip"] }
-dg_xch_puzzles = {path = "../puzzles", version="1.0.4"}
+dg_xch_core = {path = "../core", version = "1.0.5", features = ["paperclip"] }
+dg_xch_puzzles = {path = "../puzzles", version="1.0.5"}
 hkdf = "0.12.3"
 sha2 = "0.10.6"
\ No newline at end of file
diff --git a/macros/Cargo.toml b/macros/Cargo.toml
index 74bf791..e90fb28 100644
--- a/macros/Cargo.toml
+++ b/macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dg_xch_macros"
-version = "1.0.4"
+version = "1.0.5"
 edition = "2021"
 description = "Derive Marcos for Chia Serialization"
 license = "Apache-2.0"
diff --git a/proof_of_space/Cargo.toml b/proof_of_space/Cargo.toml
index eb5c86e..3a46c0d 100644
--- a/proof_of_space/Cargo.toml
+++ b/proof_of_space/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dg_xch_pos"
-version = "1.0.4"
+version = "1.0.5"
 edition = "2021"
 authors = ["James Hoerr"]
 description = "Proof of Space library for the Chia Blockchain"
@@ -10,12 +10,13 @@ repository = "https://github.com/GalactechsLLC/dg_xch_utils/proof_of_space"
 
 [dependencies]
 blake3 = "1.3.1"
-dg_xch_core = {path = "../core", version = "1.0.4", features = ["paperclip"] }
-dg_xch_serialize = {path = "../serialize", version="1.0.4"}
+dg_xch_core = {path = "../core", version = "1.0.5", features = ["paperclip"] }
+dg_xch_serialize = {path = "../serialize", version="1.0.5"}
+hex = "0.4.3"
 lazy_static = "1.4.0"
 log = "0.4.17"
 nix = "0.26.2"
 num-traits = "=0.2.14"
 rayon = "1.7.0"
 sha2 = "0.10.6"
-simple_logger = "4.0.0"
\ No newline at end of file
+simple_logger = "4.0.0"
diff --git a/puzzles/Cargo.toml b/puzzles/Cargo.toml
index e7c7a3e..feafa05 100644
--- a/puzzles/Cargo.toml
+++ b/puzzles/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dg_xch_puzzles"
-version = "1.0.4"
+version = "1.0.5"
 edition = "2021"
 authors = ["James Hoerr"]
 description = "Core library for working with CLVM puzzles"
@@ -10,8 +10,8 @@ repository = "https://github.com/GalactechsLLC/dg_xch_utils/puzzles"
 
 [dependencies]
 blst = "0.3.7"
-dg_xch_core = {path = "../core", version = "1.0.4", features = ["paperclip"] }
-dg_xch_serialize = {path = "../serialize", version="1.0.4"}
+dg_xch_core = {path = "../core", version = "1.0.5", features = ["paperclip"] }
+dg_xch_serialize = {path = "../serialize", version="1.0.5"}
 lazy_static = "1.4.0"
 num-bigint = "=0.4.0"
 num-integer = "0.1.45"
diff --git a/serialize/Cargo.toml b/serialize/Cargo.toml
index da45dd7..80e41f8 100644
--- a/serialize/Cargo.toml
+++ b/serialize/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dg_xch_serialize"
-version = "1.0.4"
+version = "1.0.5"
 edition = "2021"
 authors = ["James Hoerr"]
 description = "Low Level Support Package for dg_xch_utils"