From a45628c8757cb0d9253b3c8ff414d5abd315567e Mon Sep 17 00:00:00 2001 From: Gabriele Vernetti Date: Mon, 4 Mar 2024 12:09:22 +0100 Subject: [PATCH 1/2] version field taken from share in JDS --- .../v2/subprotocols/job-declaration/src/submit_solution.rs | 1 + roles/jd-client/src/lib/job_declarator/mod.rs | 1 + roles/jd-server/src/lib/job_declarator/message_handler.rs | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/protocols/v2/subprotocols/job-declaration/src/submit_solution.rs b/protocols/v2/subprotocols/job-declaration/src/submit_solution.rs index 53bdc65f76..4b7c30e4ca 100644 --- a/protocols/v2/subprotocols/job-declaration/src/submit_solution.rs +++ b/protocols/v2/subprotocols/job-declaration/src/submit_solution.rs @@ -17,6 +17,7 @@ pub struct SubmitSolutionJd<'decoder> { pub ntime: u32, pub nonce: u32, pub nbits: u32, + pub version: u32, } #[cfg(feature = "with_serde")] diff --git a/roles/jd-client/src/lib/job_declarator/mod.rs b/roles/jd-client/src/lib/job_declarator/mod.rs index 84154aae4f..156c909b29 100644 --- a/roles/jd-client/src/lib/job_declarator/mod.rs +++ b/roles/jd-client/src/lib/job_declarator/mod.rs @@ -422,6 +422,7 @@ impl JobDeclarator { ntime: solution.ntime, nonce: solution.nonce, nbits: prev_hash.n_bits, + version: solution.version, }; let frame: StdFrame = PoolMessages::JobDeclaration(JobDeclaration::SubmitSolution(solution)) diff --git a/roles/jd-server/src/lib/job_declarator/message_handler.rs b/roles/jd-server/src/lib/job_declarator/message_handler.rs index db8c0e2038..cf84c101ab 100644 --- a/roles/jd-server/src/lib/job_declarator/message_handler.rs +++ b/roles/jd-server/src/lib/job_declarator/message_handler.rs @@ -205,7 +205,7 @@ impl ParseClientJobDeclarationMessages for JobDeclaratorDownstream { let prev_blockhash = u256_to_block_hash(message.prev_hash.into_static()); let header = stratum_common::bitcoin::blockdata::block::BlockHeader { - version: last_declare.version as i32, + version: message.version as i32, prev_blockhash, merkle_root, time: message.ntime, From fbc8b6e58976f716a16bf25078ee2103322c2091 Mon Sep 17 00:00:00 2001 From: Gabriele Vernetti Date: Mon, 4 Mar 2024 12:09:22 +0100 Subject: [PATCH 2/2] version field taken from share in JDS --- protocols/v2/roles-logic-sv2/src/utils.rs | 2 +- .../v2/subprotocols/job-declaration/src/submit_solution.rs | 1 + roles/jd-client/src/lib/job_declarator/mod.rs | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/protocols/v2/roles-logic-sv2/src/utils.rs b/protocols/v2/roles-logic-sv2/src/utils.rs index c95ff0af5b..ba2a9aa1c5 100644 --- a/protocols/v2/roles-logic-sv2/src/utils.rs +++ b/protocols/v2/roles-logic-sv2/src/utils.rs @@ -785,7 +785,7 @@ impl<'a> From> for bitcoin::Block { let prev_blockhash = u256_to_block_hash(message.prev_hash.into_static()); let header = stratum_common::bitcoin::blockdata::block::BlockHeader { - version: last_declare.version as i32, + version: message.version as i32, prev_blockhash, merkle_root, time: message.ntime, diff --git a/protocols/v2/subprotocols/job-declaration/src/submit_solution.rs b/protocols/v2/subprotocols/job-declaration/src/submit_solution.rs index 53bdc65f76..4b7c30e4ca 100644 --- a/protocols/v2/subprotocols/job-declaration/src/submit_solution.rs +++ b/protocols/v2/subprotocols/job-declaration/src/submit_solution.rs @@ -17,6 +17,7 @@ pub struct SubmitSolutionJd<'decoder> { pub ntime: u32, pub nonce: u32, pub nbits: u32, + pub version: u32, } #[cfg(feature = "with_serde")] diff --git a/roles/jd-client/src/lib/job_declarator/mod.rs b/roles/jd-client/src/lib/job_declarator/mod.rs index 84154aae4f..156c909b29 100644 --- a/roles/jd-client/src/lib/job_declarator/mod.rs +++ b/roles/jd-client/src/lib/job_declarator/mod.rs @@ -422,6 +422,7 @@ impl JobDeclarator { ntime: solution.ntime, nonce: solution.nonce, nbits: prev_hash.n_bits, + version: solution.version, }; let frame: StdFrame = PoolMessages::JobDeclaration(JobDeclaration::SubmitSolution(solution))