From 0c48551190db640bbfd9c09cadedb92c40176bf4 Mon Sep 17 00:00:00 2001
From: nkatha23 <nkathakaburu0@gmail.com>
Date: Fri, 23 Oct 2026 12:34:47 +0300
Subject: [PATCH] fix(bitcoin-core-sv2): update field names to match
 stratum-core rename

stratum-core renamed three fields:
  SubmitSolutionOwned::header_timestamp  -> ntime
  SubmitSolutionOwned::header_nonce      -> nonce
  SetNewPrevHashOwned::header_timestamp  -> ntime_start

Update v30x and v31x template_data.rs to use the new names.
---
 .../template_distribution_protocol/template_data.rs    | 10 +++++-----
 .../template_distribution_protocol/template_data.rs    | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bitcoin-core-sv2/src/unix_capnp/v30x/template_distribution_protocol/template_data.rs b/bitcoin-core-sv2/src/unix_capnp/v30x/template_distribution_protocol/template_data.rs
index 921841bea..0d9cd7657 100644
--- a/bitcoin-core-sv2/src/unix_capnp/v30x/template_distribution_protocol/template_data.rs
+++ b/bitcoin-core-sv2/src/unix_capnp/v30x/template_distribution_protocol/template_data.rs
@@ -101,7 +101,7 @@ impl TemplateData {
         SetNewPrevHashOwned {
             template_id: self.template_id,
             prev_hash: self.get_prev_hash(),
-            header_timestamp: self.get_ntime(),
+            ntime_start: self.get_ntime(),
             n_bits: self.get_nbits(),
             target: self.get_target(),
         }
@@ -257,8 +257,8 @@ impl TemplateData {
             thread_map.clone(),
             solution_coinbase_tx,
             submit_solution.version,
-            submit_solution.header_timestamp,
-            submit_solution.header_nonce,
+            submit_solution.ntime,
+            submit_solution.nonce,
             path_dir,
         )
         .await;
@@ -267,8 +267,8 @@ impl TemplateData {
         let mut submit_solution_request_params = submit_solution_request.get();
 
         submit_solution_request_params.set_version(submit_solution.version);
-        submit_solution_request_params.set_timestamp(submit_solution.header_timestamp);
-        submit_solution_request_params.set_nonce(submit_solution.header_nonce);
+        submit_solution_request_params.set_timestamp(submit_solution.ntime);
+        submit_solution_request_params.set_nonce(submit_solution.nonce);
         submit_solution_request_params.set_coinbase(&solution_coinbase_tx_bytes);
 
         submit_solution_request_params
diff --git a/bitcoin-core-sv2/src/unix_capnp/v31x/template_distribution_protocol/template_data.rs b/bitcoin-core-sv2/src/unix_capnp/v31x/template_distribution_protocol/template_data.rs
index 0314d05ea..070aa0a4f 100644
--- a/bitcoin-core-sv2/src/unix_capnp/v31x/template_distribution_protocol/template_data.rs
+++ b/bitcoin-core-sv2/src/unix_capnp/v31x/template_distribution_protocol/template_data.rs
@@ -103,7 +103,7 @@ impl TemplateData {
         SetNewPrevHashOwned {
             template_id: self.template_id,
             prev_hash: self.get_prev_hash(),
-            header_timestamp: self.get_ntime(),
+            ntime_start: self.get_ntime(),
             n_bits: self.get_nbits(),
             target: self.get_target(),
         }
@@ -259,8 +259,8 @@ impl TemplateData {
             thread_map.clone(),
             solution_coinbase_tx,
             submit_solution.version,
-            submit_solution.header_timestamp,
-            submit_solution.header_nonce,
+            submit_solution.ntime,
+            submit_solution.nonce,
             path_dir,
         )
         .await;
@@ -269,8 +269,8 @@ impl TemplateData {
         let mut submit_solution_request_params = submit_solution_request.get();
 
         submit_solution_request_params.set_version(submit_solution.version);
-        submit_solution_request_params.set_timestamp(submit_solution.header_timestamp);
-        submit_solution_request_params.set_nonce(submit_solution.header_nonce);
+        submit_solution_request_params.set_timestamp(submit_solution.ntime);
+        submit_solution_request_params.set_nonce(submit_solution.nonce);
         submit_solution_request_params.set_coinbase(&solution_coinbase_tx_bytes);
 
         submit_solution_request_params