get_block

* apply diffs

* review fixes

binaries/cuprated/src/rpc/json.rs

@@ -277,33 +277,36 @@ async fn get_block(
     mut state: CupratedRpcHandler,
     request: GetBlockRequest,
 ) -> Result<GetBlockResponse, Error> {
-    let block = if request.hash.is_empty() {
+    let (block, block_header) = if request.hash.is_empty() {
         helper::check_height(&mut state, request.height).await?;
-        blockchain::block(&mut state.blockchain_read, request.height).await?
+        let block = blockchain::block(&mut state.blockchain_read, request.height).await?;
+        let block_header =
+            helper::block_header(&mut state, request.height, request.fill_pow_hash).await?;
+        (block, block_header)
     } else {
         let hash = helper::hex_to_hash(request.hash)?;
-        blockchain::block_by_hash(&mut state.blockchain_read, hash).await?
+        let block = blockchain::block_by_hash(&mut state.blockchain_read, hash).await?;
+        let block_header =
+            helper::block_header_by_hash(&mut state, hash, request.fill_pow_hash).await?;
+        (block, block_header)
     };
 
-    Ok(todo!())
+    let blob = hex::encode(block.serialize());
+    let miner_tx_hash = hex::encode(block.miner_transaction.hash());
+    let tx_hashes = block.transactions.iter().map(hex::encode).collect();
+    let json = {
+        let block = cuprate_types::json::block::Block::from(block);
+        serde_json::to_string_pretty(&block)?
+    };
 
-    // let block_header = (&block).into();
-    // let blob = hex::encode(block.block_blob);
-    // let miner_tx_hash = hex::encode(block.block.miner_transaction.hash());
-    // let tx_hashes = block
-    //     .txs
-    //     .into_iter()
-    //     .map(|tx| hex::encode(tx.tx_hash))
-    //     .collect();
-
-    // Ok(GetBlockResponse {
-    //     base: AccessResponseBase::ok(),
-    //     blob,
-    //     json: todo!(), // TODO: make `JSON` type in `cuprate_rpc_types`
-    //     miner_tx_hash,
-    //     tx_hashes,
-    //     block_header,
-    // })
+    Ok(GetBlockResponse {
+        base: AccessResponseBase::ok(),
+        blob,
+        json,
+        miner_tx_hash,
+        tx_hashes,
+        block_header,
+    })
 }
 
 /// <https://github.com/monero-project/monero/blob/cc73fe71162d564ffda8e549b79a350bca53c454/src/rpc/core_rpc_server.cpp#L2729-L2738>

binaries/cuprated/src/rpc/request/address_book.rs

@@ -2,7 +2,7 @@
 
 use std::convert::Infallible;
 
-use anyhow::Error;
+use anyhow::{anyhow, Error};
 use tower::ServiceExt;
 
 use cuprate_helper::cast::usize_to_u64;
@@ -11,6 +11,8 @@ use cuprate_p2p_core::{
     AddressBook, NetworkZone,
 };
 
+// FIXME: use `anyhow::Error` over `tower::BoxError` in address book.
+
 /// [`AddressBookRequest::PeerlistSize`]
 pub(crate) async fn peerlist_size<Z: NetworkZone>(
     address_book: &mut impl AddressBook<Z>,
@@ -18,10 +20,10 @@ pub(crate) async fn peerlist_size<Z: NetworkZone>(
     let AddressBookResponse::PeerlistSize { white, grey } = address_book
         .ready()
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
         .call(AddressBookRequest::PeerlistSize)
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
     else {
         unreachable!();
     };
@@ -36,10 +38,10 @@ pub(crate) async fn connection_count<Z: NetworkZone>(
     let AddressBookResponse::ConnectionCount { incoming, outgoing } = address_book
         .ready()
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
         .call(AddressBookRequest::ConnectionCount)
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
     else {
         unreachable!();
     };
@@ -55,10 +57,10 @@ pub(crate) async fn set_ban<Z: NetworkZone>(
     let AddressBookResponse::Ok = address_book
         .ready()
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
         .call(AddressBookRequest::SetBan(peer))
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
     else {
         unreachable!();
     };
@@ -74,10 +76,10 @@ pub(crate) async fn get_ban<Z: NetworkZone>(
     let AddressBookResponse::GetBan { unban_instant } = address_book
         .ready()
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
         .call(AddressBookRequest::GetBan(peer))
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
     else {
         unreachable!();
     };
@@ -92,10 +94,10 @@ pub(crate) async fn get_bans<Z: NetworkZone>(
     let AddressBookResponse::GetBans(bans) = address_book
         .ready()
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
         .call(AddressBookRequest::GetBans)
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
     else {
         unreachable!();
     };

binaries/cuprated/src/rpc/request/blockchain_context.rs

@@ -2,7 +2,7 @@
 
 use std::convert::Infallible;
 
-use anyhow::Error;
+use anyhow::{anyhow, Error};
 use tower::{Service, ServiceExt};
 
 use cuprate_consensus::context::{
@@ -11,6 +11,8 @@ use cuprate_consensus::context::{
 };
 use cuprate_types::{FeeEstimate, HardFork, HardForkInfo};
 
+// FIXME: use `anyhow::Error` over `tower::BoxError` in blockchain context.
+
 /// [`BlockChainContextRequest::Context`].
 pub(crate) async fn context(
     service: &mut BlockChainContextService,
@@ -18,10 +20,10 @@ pub(crate) async fn context(
     let BlockChainContextResponse::Context(context) = service
         .ready()
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
         .call(BlockChainContextRequest::Context)
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
     else {
         unreachable!();
     };
@@ -37,10 +39,10 @@ pub(crate) async fn hard_fork_info(
     let BlockChainContextResponse::HardForkInfo(hf_info) = service
         .ready()
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
         .call(BlockChainContextRequest::HardForkInfo(hard_fork))
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
     else {
         unreachable!();
     };
@@ -56,10 +58,10 @@ pub(crate) async fn fee_estimate(
     let BlockChainContextResponse::FeeEstimate(fee) = service
         .ready()
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
         .call(BlockChainContextRequest::FeeEstimate { grace_blocks })
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
     else {
         unreachable!();
     };

binaries/cuprated/src/rpc/request/txpool.rs

@@ -2,7 +2,7 @@
 
 use std::convert::Infallible;
 
-use anyhow::Error;
+use anyhow::{anyhow, Error};
 use tower::{Service, ServiceExt};
 
 use cuprate_helper::cast::usize_to_u64;
@@ -14,15 +14,17 @@ use cuprate_txpool::{
     TxEntry,
 };
 
+// FIXME: use `anyhow::Error` over `tower::BoxError` in txpool.
+
 /// [`TxpoolReadRequest::Backlog`]
 pub(crate) async fn backlog(txpool_read: &mut TxpoolReadHandle) -> Result<Vec<TxEntry>, Error> {
     let TxpoolReadResponse::Backlog(tx_entries) = txpool_read
         .ready()
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
         .call(TxpoolReadRequest::Backlog)
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
     else {
         unreachable!();
     };
@@ -35,10 +37,10 @@ pub(crate) async fn size(txpool_read: &mut TxpoolReadHandle) -> Result<u64, Erro
     let TxpoolReadResponse::Size(size) = txpool_read
         .ready()
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
         .call(TxpoolReadRequest::Size)
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
     else {
         unreachable!();
     };