Skip to content
Draft
9 changes: 4 additions & 5 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions stratum-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "stratum-core"
version = "0.7.0"
version = "0.8.0"
authors = ["The Stratum V2 Developers"]
edition = "2021"
readme = "README.md"
Expand All @@ -18,8 +18,8 @@ codec_sv2 = { path = "../sv2/codec-sv2", version = "^8.0.0", features = ["noise_
extensions_sv2 = { path = "../sv2/extensions-sv2", version = "^0.4.0" }
framing_sv2 = { path = "../sv2/framing-sv2", version = "^9.0.0" }
noise_sv2 = { path = "../sv2/noise-sv2", version = "^2.1.0" }
parsers_sv2 = { path = "../sv2/parsers-sv2", version = "^0.7.0" }
handlers_sv2 = { path = "../sv2/handlers-sv2", version = "^0.7.0" }
parsers_sv2 = { path = "../sv2/parsers-sv2", version = "^0.8.0" }
handlers_sv2 = { path = "../sv2/handlers-sv2", version = "^0.8.0" }
channels_sv2 = { path = "../sv2/channels-sv2", version = "^9.0.0" }
common_messages_sv2 = { path = "../sv2/subprotocols/common-messages", version = "^10.0.0" }
mining_sv2 = { path = "../sv2/subprotocols/mining", version = "^13.0.0" }
Expand Down
5 changes: 2 additions & 3 deletions sv2/handlers-sv2/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "handlers_sv2"
version = "0.7.0"
version = "0.8.0"
authors = ["The Stratum V2 Developers"]
edition = "2021"
readme = "README.md"
Expand All @@ -12,8 +12,7 @@ homepage = "https://stratumprotocol.org"
keywords = ["stratum", "mining", "bitcoin", "protocol"]

[dependencies]
parsers_sv2 = { path = "../parsers-sv2", version = "^0.7.0"}
binary_sv2 = { path = "../binary-sv2", version = "^8.0.0" }
parsers_sv2 = { path = "../parsers-sv2", version = "^0.8.0"}
common_messages_sv2 = { path = "../subprotocols/common-messages", version = "^10.0.0" }
framing_sv2 = { path = "../framing-sv2", version = "^9.0.0" }
mining_sv2 = { path = "../subprotocols/mining", version = "^13.0.0" }
Expand Down
62 changes: 14 additions & 48 deletions sv2/handlers-sv2/src/common.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
use common_messages_sv2::{
ChannelEndpointChanged, Reconnect, SetupConnectionError, SetupConnectionSuccess, *,
};
use common_messages_sv2::*;
use framing_sv2::header::Header;
use parsers_sv2::{parse_message_frame_with_tlvs, AnyMessage, CommonMessages, Tlv};
use parsers_sv2::{AnyMessage, CommonMessages, Tlv};

use crate::error::HandlerErrorType;

Expand All @@ -15,7 +13,7 @@ use crate::error::HandlerErrorType;
///
/// ## TLV Extension Support
///
/// The `tlv_data` parameter in message handlers contains validated TLV fields if the message has
/// The `tlv_fields` parameter in message handlers contains validated TLV fields if the message has
/// extension data appended. TLV fields are only passed if they match negotiated extensions
/// returned by `get_negotiated_extensions_with_server()`.
pub trait HandleCommonMessagesFromServerSync {
Expand All @@ -40,15 +38,8 @@ pub trait HandleCommonMessagesFromServerSync {
payload: &mut [u8],
) -> Result<(), Self::Error> {
let negotiated_extensions = self.get_negotiated_extensions_with_server(server_id)?;
if negotiated_extensions.is_empty() {
let parsed: CommonMessages<'_> = (header.msg_type(), payload)
.try_into()
.map_err(Self::Error::parse_error)?;
return self.handle_common_message_from_server(server_id, parsed, None);
}
let (message, tlv_fields) =
parse_message_frame_with_tlvs(header, payload, &negotiated_extensions)
.map_err(Self::Error::parse_error)?;
let (message, tlv_fields) = crate::decode_frame(header, payload, &negotiated_extensions)
.map_err(Self::Error::parse_error)?;
match message {
AnyMessage::Common(parsed) => {
self.handle_common_message_from_server(server_id, parsed, tlv_fields.as_deref())
Expand Down Expand Up @@ -129,7 +120,7 @@ pub trait HandleCommonMessagesFromServerSync {
///
/// ## TLV Extension Support
///
/// The `tlv_data` parameter in message handlers contains validated TLV fields if the message has
/// The `tlv_fields` parameter in message handlers contains validated TLV fields if the message has
/// extension data appended. TLV fields are only passed if they match negotiated extensions
/// returned by `get_negotiated_extensions_with_server()`.
#[trait_variant::make(Send)]
Expand All @@ -156,17 +147,8 @@ pub trait HandleCommonMessagesFromServerAsync {
) -> Result<(), Self::Error> {
async move {
let negotiated_extensions = self.get_negotiated_extensions_with_server(server_id)?;
if negotiated_extensions.is_empty() {
let parsed: CommonMessages<'_> = (header.msg_type(), payload)
.try_into()
.map_err(Self::Error::parse_error)?;
return self
.handle_common_message_from_server(server_id, parsed, None)
.await;
}
let (parsed, tlv_fields) =
parse_message_frame_with_tlvs(header, payload, &negotiated_extensions)
.map_err(Self::Error::parse_error)?;
let (parsed, tlv_fields) = crate::decode_frame(header, payload, &negotiated_extensions)
.map_err(Self::Error::parse_error)?;
match parsed {
AnyMessage::Common(parsed) => {
self.handle_common_message_from_server(server_id, parsed, tlv_fields.as_deref())
Expand Down Expand Up @@ -257,7 +239,7 @@ pub trait HandleCommonMessagesFromServerAsync {
///
/// ## TLV Extension Support
///
/// The `tlv_data` parameter in message handlers contains validated TLV fields if the message has
/// The `tlv_fields` parameter in message handlers contains validated TLV fields if the message has
/// extension data appended. TLV fields are only passed if they match negotiated extensions
/// returned by `get_negotiated_extensions_with_client()`.
pub trait HandleCommonMessagesFromClientSync {
Expand All @@ -282,15 +264,8 @@ pub trait HandleCommonMessagesFromClientSync {
payload: &mut [u8],
) -> Result<(), Self::Error> {
let negotiated_extensions = self.get_negotiated_extensions_with_client(client_id)?;
if negotiated_extensions.is_empty() {
let parsed: CommonMessages<'_> = (header.msg_type(), payload)
.try_into()
.map_err(Self::Error::parse_error)?;
return self.handle_common_message_from_client(client_id, parsed, None);
}
let (parsed, tlv_fields) =
parse_message_frame_with_tlvs(header, payload, &negotiated_extensions)
.map_err(Self::Error::parse_error)?;
let (parsed, tlv_fields) = crate::decode_frame(header, payload, &negotiated_extensions)
.map_err(Self::Error::parse_error)?;
match parsed {
AnyMessage::Common(parsed) => {
self.handle_common_message_from_client(client_id, parsed, tlv_fields.as_deref())
Expand Down Expand Up @@ -354,7 +329,7 @@ pub trait HandleCommonMessagesFromClientSync {
///
/// ## TLV Extension Support
///
/// The `tlv_data` parameter in message handlers contains validated TLV fields if the message has
/// The `tlv_fields` parameter in message handlers contains validated TLV fields if the message has
/// extension data appended. TLV fields are only passed if they match negotiated extensions
/// returned by `get_negotiated_extensions_with_client()`.
#[trait_variant::make(Send)]
Expand All @@ -381,17 +356,8 @@ pub trait HandleCommonMessagesFromClientAsync {
) -> Result<(), Self::Error> {
async move {
let negotiated_extensions = self.get_negotiated_extensions_with_client(client_id)?;
if negotiated_extensions.is_empty() {
let parsed: CommonMessages<'_> = (header.msg_type(), payload)
.try_into()
.map_err(Self::Error::parse_error)?;
return self
.handle_common_message_from_client(client_id, parsed, None)
.await;
}
let (parsed, tlv_fields) =
parse_message_frame_with_tlvs(header, payload, &negotiated_extensions)
.map_err(Self::Error::parse_error)?;
let (parsed, tlv_fields) = crate::decode_frame(header, payload, &negotiated_extensions)
.map_err(Self::Error::parse_error)?;
match parsed {
AnyMessage::Common(parsed) => {
self.handle_common_message_from_client(client_id, parsed, tlv_fields.as_deref())
Expand Down
60 changes: 13 additions & 47 deletions sv2/handlers-sv2/src/common_owned.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
use common_messages_sv2::*;
use framing_sv2::header::Header;
use parsers_sv2::{
parse_message_frame_with_tlvs, AnyMessage, CommonMessages, CommonMessagesOwned, Tlv,
};
use parsers_sv2::{AnyMessage, CommonMessagesOwned, Tlv};

use crate::error::HandlerErrorType;

Expand All @@ -15,7 +13,7 @@ use crate::error::HandlerErrorType;
///
/// ## TLV Extension Support
///
/// The `tlv_data` parameter in message handlers contains validated TLV fields if the message has
/// The `tlv_fields` parameter in message handlers contains validated TLV fields if the message has
/// extension data appended. TLV fields are only passed if they match negotiated extensions
/// returned by `get_negotiated_extensions_with_server()`.
pub trait HandleCommonMessagesFromServerOwnedSync {
Expand All @@ -40,15 +38,8 @@ pub trait HandleCommonMessagesFromServerOwnedSync {
payload: &mut [u8],
) -> Result<(), Self::Error> {
let negotiated_extensions = self.get_negotiated_extensions_with_server(server_id)?;
if negotiated_extensions.is_empty() {
let parsed: CommonMessages<'_> = (header.msg_type(), payload)
.try_into()
.map_err(Self::Error::parse_error)?;
return self.handle_common_message_from_server(server_id, parsed.into_owned(), None);
}
let (message, tlv_fields) =
parse_message_frame_with_tlvs(header, payload, &negotiated_extensions)
.map_err(Self::Error::parse_error)?;
let (message, tlv_fields) = crate::decode_frame(header, payload, &negotiated_extensions)
.map_err(Self::Error::parse_error)?;
match message {
AnyMessage::Common(parsed) => self.handle_common_message_from_server(
server_id,
Expand Down Expand Up @@ -133,7 +124,7 @@ pub trait HandleCommonMessagesFromServerOwnedSync {
///
/// ## TLV Extension Support
///
/// The `tlv_data` parameter in message handlers contains validated TLV fields if the message has
/// The `tlv_fields` parameter in message handlers contains validated TLV fields if the message has
/// extension data appended. TLV fields are only passed if they match negotiated extensions
/// returned by `get_negotiated_extensions_with_server()`.
#[trait_variant::make(Send)]
Expand All @@ -160,17 +151,8 @@ pub trait HandleCommonMessagesFromServerOwnedAsync {
) -> Result<(), Self::Error> {
async move {
let negotiated_extensions = self.get_negotiated_extensions_with_server(server_id)?;
if negotiated_extensions.is_empty() {
let parsed: CommonMessages<'_> = (header.msg_type(), payload)
.try_into()
.map_err(Self::Error::parse_error)?;
return self
.handle_common_message_from_server(server_id, parsed.into_owned(), None)
.await;
}
let (parsed, tlv_fields) =
parse_message_frame_with_tlvs(header, payload, &negotiated_extensions)
.map_err(Self::Error::parse_error)?;
let (parsed, tlv_fields) = crate::decode_frame(header, payload, &negotiated_extensions)
.map_err(Self::Error::parse_error)?;
match parsed {
AnyMessage::Common(parsed) => {
self.handle_common_message_from_server(
Expand Down Expand Up @@ -265,7 +247,7 @@ pub trait HandleCommonMessagesFromServerOwnedAsync {
///
/// ## TLV Extension Support
///
/// The `tlv_data` parameter in message handlers contains validated TLV fields if the message has
/// The `tlv_fields` parameter in message handlers contains validated TLV fields if the message has
/// extension data appended. TLV fields are only passed if they match negotiated extensions
/// returned by `get_negotiated_extensions_with_client()`.
pub trait HandleCommonMessagesFromClientOwnedSync {
Expand All @@ -290,15 +272,8 @@ pub trait HandleCommonMessagesFromClientOwnedSync {
payload: &mut [u8],
) -> Result<(), Self::Error> {
let negotiated_extensions = self.get_negotiated_extensions_with_client(client_id)?;
if negotiated_extensions.is_empty() {
let parsed: CommonMessages<'_> = (header.msg_type(), payload)
.try_into()
.map_err(Self::Error::parse_error)?;
return self.handle_common_message_from_client(client_id, parsed.into_owned(), None);
}
let (parsed, tlv_fields) =
parse_message_frame_with_tlvs(header, payload, &negotiated_extensions)
.map_err(Self::Error::parse_error)?;
let (parsed, tlv_fields) = crate::decode_frame(header, payload, &negotiated_extensions)
.map_err(Self::Error::parse_error)?;
match parsed {
AnyMessage::Common(parsed) => self.handle_common_message_from_client(
client_id,
Expand Down Expand Up @@ -364,7 +339,7 @@ pub trait HandleCommonMessagesFromClientOwnedSync {
///
/// ## TLV Extension Support
///
/// The `tlv_data` parameter in message handlers contains validated TLV fields if the message has
/// The `tlv_fields` parameter in message handlers contains validated TLV fields if the message has
/// extension data appended. TLV fields are only passed if they match negotiated extensions
/// returned by `get_negotiated_extensions_with_client()`.
#[trait_variant::make(Send)]
Expand All @@ -391,17 +366,8 @@ pub trait HandleCommonMessagesFromClientOwnedAsync {
) -> Result<(), Self::Error> {
async move {
let negotiated_extensions = self.get_negotiated_extensions_with_client(client_id)?;
if negotiated_extensions.is_empty() {
let parsed: CommonMessages<'_> = (header.msg_type(), payload)
.try_into()
.map_err(Self::Error::parse_error)?;
return self
.handle_common_message_from_client(client_id, parsed.into_owned(), None)
.await;
}
let (parsed, tlv_fields) =
parse_message_frame_with_tlvs(header, payload, &negotiated_extensions)
.map_err(Self::Error::parse_error)?;
let (parsed, tlv_fields) = crate::decode_frame(header, payload, &negotiated_extensions)
.map_err(Self::Error::parse_error)?;
match parsed {
AnyMessage::Common(parsed) => {
self.handle_common_message_from_client(
Expand Down
Loading
Loading