change get_block_header_info() to return the additional info includin…

…g coinbase and merkle_proof.
Danconnolly · Mar 7, 2024 · 094c43e · 094c43e
1 parent 23bfa3d
commit 094c43e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -23,7 +23,7 @@ jsonrpc = { version = "0.16.0", features = ["minreq_http"]}
 serde = "1"
 serde_json = "1"
 hex = "0.4.3"
-bitcoinsv = "0.2.1"
+bitcoinsv = "0.2.2"
 async-trait = "0.1.75"
 
 [dev-dependencies]

diff --git a/client/src/client.rs b/client/src/client.rs
@@ -259,7 +259,7 @@ pub trait RpcApi: Sized {
 
     /// Returns the block header as a BlockHeader struct.
     fn get_block_header(&self, hash: &BlockHash) -> Result<BlockHeader> {
-        let hex: String = self.call("getblockheader", &[into_json(hash)?, false.into()])?;
+        let hex: String = self.call("getblockheader", &[into_json(hash)?, 0.into()])?;
         Ok(BlockHeader::from_hex(hex)?)
     }
 
@@ -268,7 +268,7 @@ pub trait RpcApi: Sized {
         &self,
         hash: &BlockHash,
     ) -> Result<json::GetBlockHeaderResult> {
-        self.call("getblockheader", &[into_json(hash)?, true.into()])
+        self.call("getblockheader", &[into_json(hash)?, 2.into()])
     }
 
     /// Compute per block statistics for a given window.

diff --git a/json/Cargo.toml b/json/Cargo.toml
@@ -20,7 +20,7 @@ path = "src/lib.rs"
 hex = "0.4.3"
 serde = { version = "1", features = [ "derive" ] }
 serde_json = "1"
-bitcoinsv = "0.2.1"
+bitcoinsv = "0.2.2"
 
 [dev-dependencies]
 approx = "0.5"
diff --git a/json/src/lib.rs b/json/src/lib.rs
@@ -13,7 +13,7 @@ use std::collections::HashMap;
 use serde::{Deserialize, Serialize};
 use std::fmt;
 pub use bitcoinsv::Error;
-pub use bitcoinsv::bitcoin::{BlockchainId, BlockHash, Encodable, MerkleRoot, Tx, TxHash};
+pub use bitcoinsv::bitcoin::{BlockchainId, BlockHash, Encodable, Hash, MerkleRoot, Tx, TxHash};
 pub use bitcoinsv::util::Amount;
 
 /// A module used for serde serialization of bytes in hexadecimal format.
@@ -338,6 +338,10 @@ pub struct GetBlockHeaderResult {
     #[serde(rename = "nextblockhash")]
     pub next_block_hash: Option<BlockHash>,
     pub status: GetBlockResultStatus,
+    #[serde(rename = "tx")]
+    pub coinbase_tx: GetRawTransactionResult,
+    #[serde(rename = "merkleproof")]
+    pub coinbase_merkle_proof: Vec<Hash>,
 }
 
 #[derive(Clone, PartialEq, Debug, Deserialize, Serialize)]