|
|
@ -4,7 +4,8 @@ use bitcoin::blockdata::transaction::Transaction; |
|
|
use bitcoin::consensus::encode::{deserialize, serialize}; |
|
|
use bitcoin::consensus::encode::{deserialize, serialize}; |
|
|
use bitcoin::network::constants::Network; |
|
|
use bitcoin::network::constants::Network; |
|
|
use bitcoin::util::hash::BitcoinHash; |
|
|
use bitcoin::util::hash::BitcoinHash; |
|
|
use bitcoin::util::hash::Sha256dHash; |
|
|
use bitcoin_hashes::hex::{FromHex, ToHex}; |
|
|
|
|
|
use bitcoin_hashes::sha256d::Hash as Sha256dHash; |
|
|
use glob; |
|
|
use glob; |
|
|
use hex; |
|
|
use hex; |
|
|
use serde_json::{from_str, from_value, Value}; |
|
|
use serde_json::{from_str, from_value, Value}; |
|
|
@ -453,7 +454,7 @@ impl Daemon { |
|
|
pub fn getblockheader(&self, blockhash: &Sha256dHash) -> Result<BlockHeader> { |
|
|
pub fn getblockheader(&self, blockhash: &Sha256dHash) -> Result<BlockHeader> { |
|
|
header_from_value(self.request( |
|
|
header_from_value(self.request( |
|
|
"getblockheader", |
|
|
"getblockheader", |
|
|
json!([blockhash.be_hex_string(), /*verbose=*/ false]), |
|
|
json!([blockhash.to_hex(), /*verbose=*/ false]), |
|
|
)?) |
|
|
)?) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -472,32 +473,28 @@ impl Daemon { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
pub fn getblock(&self, blockhash: &Sha256dHash) -> Result<Block> { |
|
|
pub fn getblock(&self, blockhash: &Sha256dHash) -> Result<Block> { |
|
|
let block = block_from_value(self.request( |
|
|
let block = block_from_value( |
|
|
"getblock", |
|
|
self.request("getblock", json!([blockhash.to_hex(), /*verbose=*/ false]))?, |
|
|
json!([blockhash.be_hex_string(), /*verbose=*/ false]), |
|
|
)?; |
|
|
)?)?; |
|
|
|
|
|
assert_eq!(block.bitcoin_hash(), *blockhash); |
|
|
assert_eq!(block.bitcoin_hash(), *blockhash); |
|
|
Ok(block) |
|
|
Ok(block) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
pub fn getblocktxids(&self, blockhash: &Sha256dHash) -> Result<Vec<Sha256dHash>> { |
|
|
pub fn getblocktxids(&self, blockhash: &Sha256dHash) -> Result<Vec<Sha256dHash>> { |
|
|
self.request( |
|
|
self.request("getblock", json!([blockhash.to_hex(), /*verbose=*/ 1]))? |
|
|
"getblock", |
|
|
.get("tx") |
|
|
json!([blockhash.be_hex_string(), /*verbose=*/ 1]), |
|
|
.chain_err(|| "block missing txids")? |
|
|
)? |
|
|
.as_array() |
|
|
.get("tx") |
|
|
.chain_err(|| "invalid block txids")? |
|
|
.chain_err(|| "block missing txids")? |
|
|
.iter() |
|
|
.as_array() |
|
|
.map(parse_hash) |
|
|
.chain_err(|| "invalid block txids")? |
|
|
.collect::<Result<Vec<Sha256dHash>>>() |
|
|
.iter() |
|
|
|
|
|
.map(parse_hash) |
|
|
|
|
|
.collect::<Result<Vec<Sha256dHash>>>() |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
pub fn getblocks(&self, blockhashes: &[Sha256dHash]) -> Result<Vec<Block>> { |
|
|
pub fn getblocks(&self, blockhashes: &[Sha256dHash]) -> Result<Vec<Block>> { |
|
|
let params_list: Vec<Value> = blockhashes |
|
|
let params_list: Vec<Value> = blockhashes |
|
|
.iter() |
|
|
.iter() |
|
|
.map(|hash| json!([hash.be_hex_string(), /*verbose=*/ false])) |
|
|
.map(|hash| json!([hash.to_hex(), /*verbose=*/ false])) |
|
|
.collect(); |
|
|
.collect(); |
|
|
let values = self.requests("getblock", ¶ms_list)?; |
|
|
let values = self.requests("getblock", ¶ms_list)?; |
|
|
let mut blocks = vec![]; |
|
|
let mut blocks = vec![]; |
|
|
@ -512,11 +509,9 @@ impl Daemon { |
|
|
txhash: &Sha256dHash, |
|
|
txhash: &Sha256dHash, |
|
|
blockhash: Option<Sha256dHash>, |
|
|
blockhash: Option<Sha256dHash>, |
|
|
) -> Result<Transaction> { |
|
|
) -> Result<Transaction> { |
|
|
let mut args = json!([txhash.be_hex_string(), /*verbose=*/ false]); |
|
|
let mut args = json!([txhash.to_hex(), /*verbose=*/ false]); |
|
|
if let Some(blockhash) = blockhash { |
|
|
if let Some(blockhash) = blockhash { |
|
|
args.as_array_mut() |
|
|
args.as_array_mut().unwrap().push(json!(blockhash.to_hex())); |
|
|
.unwrap() |
|
|
|
|
|
.push(json!(blockhash.be_hex_string())); |
|
|
|
|
|
} |
|
|
} |
|
|
tx_from_value(self.request("getrawtransaction", args)?) |
|
|
tx_from_value(self.request("getrawtransaction", args)?) |
|
|
} |
|
|
} |
|
|
@ -527,11 +522,9 @@ impl Daemon { |
|
|
blockhash: Option<Sha256dHash>, |
|
|
blockhash: Option<Sha256dHash>, |
|
|
verbose: bool, |
|
|
verbose: bool, |
|
|
) -> Result<Value> { |
|
|
) -> Result<Value> { |
|
|
let mut args = json!([txhash.be_hex_string(), verbose]); |
|
|
let mut args = json!([txhash.to_hex(), verbose]); |
|
|
if let Some(blockhash) = blockhash { |
|
|
if let Some(blockhash) = blockhash { |
|
|
args.as_array_mut() |
|
|
args.as_array_mut().unwrap().push(json!(blockhash.to_hex())); |
|
|
.unwrap() |
|
|
|
|
|
.push(json!(blockhash.be_hex_string())); |
|
|
|
|
|
} |
|
|
} |
|
|
Ok(self.request("getrawtransaction", args)?) |
|
|
Ok(self.request("getrawtransaction", args)?) |
|
|
} |
|
|
} |
|
|
@ -539,7 +532,7 @@ impl Daemon { |
|
|
pub fn gettransactions(&self, txhashes: &[&Sha256dHash]) -> Result<Vec<Transaction>> { |
|
|
pub fn gettransactions(&self, txhashes: &[&Sha256dHash]) -> Result<Vec<Transaction>> { |
|
|
let params_list: Vec<Value> = txhashes |
|
|
let params_list: Vec<Value> = txhashes |
|
|
.iter() |
|
|
.iter() |
|
|
.map(|txhash| json!([txhash.be_hex_string(), /*verbose=*/ false])) |
|
|
.map(|txhash| json!([txhash.to_hex(), /*verbose=*/ false])) |
|
|
.collect(); |
|
|
.collect(); |
|
|
|
|
|
|
|
|
let values = self.requests("getrawtransaction", ¶ms_list)?; |
|
|
let values = self.requests("getrawtransaction", ¶ms_list)?; |
|
|
@ -561,7 +554,7 @@ impl Daemon { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
pub fn getmempoolentry(&self, txid: &Sha256dHash) -> Result<MempoolEntry> { |
|
|
pub fn getmempoolentry(&self, txid: &Sha256dHash) -> Result<MempoolEntry> { |
|
|
let entry = self.request("getmempoolentry", json!([txid.be_hex_string()]))?; |
|
|
let entry = self.request("getmempoolentry", json!([txid.to_hex()]))?; |
|
|
let fee = (entry |
|
|
let fee = (entry |
|
|
.get("fee") |
|
|
.get("fee") |
|
|
.chain_err(|| "missing fee")? |
|
|
.chain_err(|| "missing fee")? |
|
|
@ -586,7 +579,7 @@ impl Daemon { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
fn get_all_headers(&self, tip: &Sha256dHash) -> Result<Vec<BlockHeader>> { |
|
|
fn get_all_headers(&self, tip: &Sha256dHash) -> Result<Vec<BlockHeader>> { |
|
|
let info: Value = self.request("getblockheader", json!([tip.be_hex_string()]))?; |
|
|
let info: Value = self.request("getblockheader", json!([tip.to_hex()]))?; |
|
|
let tip_height = info |
|
|
let tip_height = info |
|
|
.get("height") |
|
|
.get("height") |
|
|
.expect("missing height") |
|
|
.expect("missing height") |
|
|
|
Roman Zeyde
6 years ago