fix PushSolution field order

Author: GitGab19

Cargo.lock

@@ -24,7 +24,7 @@ channels_sv2 = { path = "../sv2/channels-sv2", version = "^6.0.0" }
 common_messages_sv2 = { path = "../sv2/subprotocols/common-messages", version = "^7.2.0" }
 mining_sv2 = { path = "../sv2/subprotocols/mining", version = "^10.0.0" }
 template_distribution_sv2 = { path = "../sv2/subprotocols/template-distribution", version = "^5.1.0" }
-job_declaration_sv2 = { path = "../sv2/subprotocols/job-declaration", version = "^7.1.0" }
+job_declaration_sv2 = { path = "../sv2/subprotocols/job-declaration", version = "^8.0.0" }
 sv1_api = { path = "../sv1", version = "^4.0.0", optional = true }
 stratum_translation = { path = "stratum-translation", version = "^0.3.0", optional = true }
 bitcoin = { workspace = true }

stratum-core/Cargo.toml

@@ -18,6 +18,6 @@ common_messages_sv2 = { path = "../subprotocols/common-messages", version = "^7.
 framing_sv2 = { path = "../framing-sv2", version = "^6.0.0" }
 mining_sv2 = { path = "../subprotocols/mining", version = "^10.0.0" }
 template_distribution_sv2 = { path = "../subprotocols/template-distribution", version = "^5.1.0" }
-job_declaration_sv2 = { path = "../subprotocols/job-declaration", version = "^7.1.0" }
+job_declaration_sv2 = { path = "../subprotocols/job-declaration", version = "^8.0.0" }
 extensions_sv2 = { path = "../extensions-sv2", version = "^0.1.0" }
 trait-variant = { workspace = true }

sv2/handlers-sv2/Cargo.toml

@@ -17,7 +17,7 @@ framing_sv2 = { path = "../framing-sv2", version = "^6.0.0" }
 common_messages_sv2 = { path = "../subprotocols/common-messages", version = "^7.2.0" }
 mining_sv2 = { path = "../subprotocols/mining", version = "^10.0.0" }
 template_distribution_sv2 = { path = "../subprotocols/template-distribution", version = "^5.1.0" }
-job_declaration_sv2 = { path = "../subprotocols/job-declaration", version = "^7.1.0" }
+job_declaration_sv2 = { path = "../subprotocols/job-declaration", version = "^8.0.0" }
 extensions_sv2 = { path = "../extensions-sv2", version = "^0.1.0" }
 
 [dev-dependencies]

sv2/parsers-sv2/Cargo.toml

@@ -1748,14 +1748,15 @@ impl<'a> TryFrom<AnyMessage<'a>> for MiningDeviceMessages<'a> {
 
 #[cfg(test)]
 mod test {
-    use crate::{AnyMessage, Extensions, ExtensionsNegotiation, Mining};
+    use crate::{AnyMessage, Extensions, ExtensionsNegotiation, JobDeclaration, Mining};
     use alloc::string::String;
     use alloc::vec;
     use alloc::vec::Vec;
-    use binary_sv2::{Seq0255, Seq064K, Str0255, Sv2Option, B0255, B064K, U256};
+    use binary_sv2::{Seq0255, Seq064K, Str0255, Sv2Option, B0255, B032, B064K, U256};
     use codec_sv2::StandardSv2Frame;
     use core::convert::{TryFrom, TryInto};
     use extensions_sv2::{RequestExtensions, EXTENSION_TYPE_EXTENSIONS_NEGOTIATION};
+    use job_declaration_sv2::PushSolution;
     use mining_sv2::{
         NewMiningJob, SetCustomMiningJob, SetCustomMiningJobError, SetCustomMiningJobSuccess,
     };
@@ -1853,6 +1854,28 @@ mod test {
         }
     }
 
+    #[test]
+    fn push_solution_serialization() {
+        let mut correctly_serialized_msg = vec![0, 0, 0x60, 53, 0, 0, 4, 1, 2, 3, 4];
+        correctly_serialized_msg.extend(5_u8..37);
+        correctly_serialized_msg.extend(0x11223344_u32.to_le_bytes());
+        correctly_serialized_msg.extend(0x55667788_u32.to_le_bytes());
+        correctly_serialized_msg.extend(0x99aabbcc_u32.to_le_bytes());
+        correctly_serialized_msg.extend(0xddeeff00_u32.to_le_bytes());
+
+        let job_declaration_message =
+            AnyMessage::JobDeclaration(JobDeclaration::PushSolution(PushSolution {
+                extranonce: B032::try_from(vec![1, 2, 3, 4]).unwrap(),
+                prev_hash: U256::try_from((5_u8..37).collect::<Vec<u8>>()).unwrap(),
+                nonce: 0x11223344,
+                ntime: 0x55667788,
+                nbits: 0x99aabbcc,
+                version: 0xddeeff00,
+            }));
+
+        message_serialization_check(job_declaration_message, &correctly_serialized_msg);
+    }
+
     fn message_serialization_check(message: AnyMessage<'static>, expected_result: &[u8]) {
         let frame = StdFrame::try_from(message).unwrap();
         let encoded_frame_length = frame.encoded_length();

sv2/parsers-sv2/src/lib.rs

@@ -1,6 +1,6 @@
 [package]
 name = "job_declaration_sv2"
-version = "7.1.0"
+version = "8.0.0"
 authors = ["The Stratum V2 Developers"]
 edition = "2021"
 readme = "README.md"

sv2/subprotocols/job-declaration/Cargo.toml

@@ -19,10 +19,10 @@ pub struct PushSolution<'decoder> {
     pub extranonce: B032<'decoder>,
     /// Previous block hash.
     pub prev_hash: U256<'decoder>,
-    /// Contains the time the block was constructed as a Unix timestamp.
-    pub ntime: u32,
     /// Nonce of the block.
     pub nonce: u32,
+    /// Contains the time the block was constructed as a Unix timestamp.
+    pub ntime: u32,
     /// The bits field is compact representation of the target at the time the block was mined.
     pub nbits: u32,
     /// The version field in a Bitcoin header initially indicated protocol rule changes. [`BIP9`]
@@ -40,11 +40,11 @@ impl fmt::Display for PushSolution<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(
             f,
-            "PushSolution(extranonce: {}, prev_hash: {}, ntime: {}, nonce: 0x{:08x}, nbits: 0x{:08x}, version: 0x{:08x})",
+            "PushSolution(extranonce: {}, prev_hash: {}, nonce: 0x{:08x}, ntime: {}, nbits: 0x{:08x}, version: 0x{:08x})",
             self.extranonce,
             self.prev_hash,
-            self.ntime,
             self.nonce,
+            self.ntime,
             self.nbits,
             self.version
         )