Skip to content

Commit

Permalink
VdfOutput fix and client updates (#12)
Browse files Browse the repository at this point in the history
* Version bumps, Fixes parsing error for VDFOutput and client updates

* version 1.0.5 for cargo
  • Loading branch information
DaOneLuna authored Jul 31, 2023
1 parent 3137dc2 commit 88fe03e
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 36 deletions.
2 changes: 1 addition & 1 deletion bls/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
12 changes: 6 additions & 6 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand Down
14 changes: 7 additions & 7 deletions clients/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"]}
2 changes: 1 addition & 1 deletion clients/src/rpc/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions clients/src/websocket/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)))?,
);

Expand Down Expand Up @@ -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(
Expand All @@ -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());
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion core/src/blockchain/vdf_output.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
6 changes: 3 additions & 3 deletions keys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
2 changes: 1 addition & 1 deletion macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
9 changes: 5 additions & 4 deletions proof_of_space/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
simple_logger = "4.0.0"
6 changes: 3 additions & 3 deletions puzzles/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion serialize/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down

0 comments on commit 88fe03e

Please sign in to comment.