rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2025-07-08 02:45:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1727

Browse source 
0288310e blockchain_db: add "raw" blobdata getters for block and transaction (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-02-21 11:27:15 +02:00
commit 49efd3add9
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
13 changed files with 230 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/rpc/core_rpc_server.cpp
View file

@ -151,7 +151,7 @@ namespace cryptonote
bool core_rpc_server::on_get_blocks(const COMMAND_RPC_GET_BLOCKS_FAST::request& req, COMMAND_RPC_GET_BLOCKS_FAST::response& res)
{
CHECK_CORE_BUSY();
std::list<std::pair<block, std::list<transaction> > > bs;
std::list<std::pair<cryptonote::blobdata, std::list<cryptonote::blobdata> > > bs;
if(!m_core.find_blockchain_supplement(req.start_height, req.block_ids, bs, res.current_height, res.start_height, COMMAND_RPC_GET_BLOCKS_FAST_MAX_COUNT))
{
@ -159,24 +159,30 @@ namespace cryptonote
return false;
}
for(auto& b: bs)
for(auto& bd: bs)
{
res.blocks.resize(res.blocks.size()+1);
res.blocks.back().block = block_to_blob(b.first);
res.blocks.back().block = bd.first;
res.output_indices.push_back(COMMAND_RPC_GET_BLOCKS_FAST::block_output_indices());
res.output_indices.back().indices.push_back(COMMAND_RPC_GET_BLOCKS_FAST::tx_output_indices());
bool r = m_core.get_tx_outputs_gindexs(get_transaction_hash(b.first.miner_tx), res.output_indices.back().indices.back().indices);
block b;
if (!parse_and_validate_block_from_blob(bd.first, b))
{
res.status = "Invalid block";
return false;
}
bool r = m_core.get_tx_outputs_gindexs(get_transaction_hash(b.miner_tx), res.output_indices.back().indices.back().indices);
if (!r)
{
res.status = "Failed";
return false;
}
size_t txidx = 0;
for(auto& t: b.second)
for(const auto& t: bd.second)
{
res.blocks.back().txs.push_back(tx_to_blob(t));
res.blocks.back().txs.push_back(t);
res.output_indices.back().indices.push_back(COMMAND_RPC_GET_BLOCKS_FAST::tx_output_indices());
bool r = m_core.get_tx_outputs_gindexs(b.first.tx_hashes[txidx++], res.output_indices.back().indices.back().indices);
bool r = m_core.get_tx_outputs_gindexs(b.tx_hashes[txidx++], res.output_indices.back().indices.back().indices);
if (!r)
{
res.status = "Failed";