Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

import TryInto on template_distribution_sv2 #1086

Merged
merged 2 commits into from
Aug 9, 2024
Merged

import TryInto on template_distribution_sv2 #1086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12df8e2
import TryInto on template_distribution_sv2
plebhash Aug 9, 2024
100a331
enable framing_sv2/with_serde feature for roles_logic_sv2
plebhash Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion protocols/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions protocols/v2/roles-logic-sv2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ serde = { version = "1.0.89", features = ["derive", "alloc"], default-features =
binary_sv2 = {version = "^1.0.0", path = "../../../protocols/v2/binary-sv2/binary-sv2", default-features = true }
common_messages_sv2 = { path = "../../../protocols/v2/subprotocols/common-messages", version = "^1.0.0" }
mining_sv2 = { path = "../../../protocols/v2/subprotocols/mining", version = "^1.0.0" }
template_distribution_sv2 = { path = "../../../protocols/v2/subprotocols/template-distribution", version = "^1.0.0" }
template_distribution_sv2 = { path = "../../../protocols/v2/subprotocols/template-distribution", version = "^1.0.1" }
job_declaration_sv2 = { path = "../../../protocols/v2/subprotocols/job-declaration", version = "^1.0.0" }
const_sv2 = { version = "^1.0.0", path = "../../../protocols/v2/const-sv2"}
framing_sv2 = { version = "^1.1.0", path = "../../../protocols/v2/framing-sv2" }
Expand All @@ -35,7 +35,8 @@ with_serde = [ "serde",
"common_messages_sv2/with_serde",
"template_distribution_sv2/with_serde",
"job_declaration_sv2/with_serde",
"mining_sv2/with_serde"]
"mining_sv2/with_serde",
"framing_sv2/with_serde"]
prop_test = ["template_distribution_sv2/prop_test"]
# Code coverage tools may conflict with the nopanic logic, so we can disable it when needed
disable_nopanic = []
2 changes: 1 addition & 1 deletion protocols/v2/subprotocols/template-distribution/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "template_distribution_sv2"
version = "1.0.0"
version = "1.0.1"
authors = ["fi3 <[email protected]>"]
edition = "2018"
description = "Sv2 template distribution subprotocol"
Expand Down
2 changes: 2 additions & 0 deletions protocols/v2/subprotocols/template-distribution/src/new_template.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ use binary_sv2::Error;
use binary_sv2::{Deserialize, Seq0255, Serialize, B0255, B064K, U256};
#[cfg(not(feature = "with_serde"))]
use core::convert::TryInto;
#[cfg(all(feature = "with_serde", not(feature = "no_std")))]
use std::convert::TryInto;

/// ## NewTemplate (Server -> Client)
/// The primary template-providing function. Note that the coinbase_tx_outputs bytes will appear
Expand Down
2 changes: 1 addition & 1 deletion protocols/v2/sv2-ffi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ codec_sv2 = { path = "../../../protocols/v2/codec-sv2", version = "^1.0.0" }
const_sv2 = { path = "../../../protocols/v2/const-sv2", version = "^1.0.0" }
binary_sv2 = { path = "../../../protocols/v2/binary-sv2/binary-sv2", version = "^1.0.0" }
common_messages_sv2 = { path = "../../../protocols/v2/subprotocols/common-messages", version = "^1.0.0" }
template_distribution_sv2 = { path = "../../../protocols/v2/subprotocols/template-distribution", version = "^1.0.0" }
template_distribution_sv2 = { path = "../../../protocols/v2/subprotocols/template-distribution", version = "^1.0.1" }

[dev-dependencies]
quickcheck = "1.0.3"
Expand Down
Loading