Merge pull request stratum-mining#1086 from plebhash/fix-template-dis…

…tribution-sv2 import `TryInto` on `template_distribution_sv2`
rrybarczyk · Aug 9, 2024 · c1d4cf3 · c1d4cf3
2 parents 0566798 + 100a331
commit c1d4cf3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/protocols/Cargo.lock b/protocols/Cargo.lock
diff --git a/protocols/v2/roles-logic-sv2/Cargo.toml b/protocols/v2/roles-logic-sv2/Cargo.toml
@@ -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" }
@@ -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 = []
diff --git a/protocols/v2/subprotocols/template-distribution/Cargo.toml b/protocols/v2/subprotocols/template-distribution/Cargo.toml
@@ -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"

diff --git a/protocols/v2/subprotocols/template-distribution/src/new_template.rs b/protocols/v2/subprotocols/template-distribution/src/new_template.rs
@@ -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

diff --git a/protocols/v2/sv2-ffi/Cargo.toml b/protocols/v2/sv2-ffi/Cargo.toml
@@ -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"