Permalink
Browse files

rpc: add option to skip coinbase info in get_blocks.bin

  • Loading branch information...
moneromooo-monero committed Apr 15, 2018
1 parent a2b557f commit 6795bd0d4eb680f378ea779a130cefad618e11d2
Showing with 10 additions and 4 deletions.
  1. +7 −4 src/rpc/core_rpc_server.cpp
  2. +2 −0 src/rpc/core_rpc_server_commands_defs.h
  3. +1 −0 src/wallet/wallet2.cpp
@@ -249,11 +249,14 @@ namespace cryptonote
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)
if (!req.no_miner_tx)
{
res.status = "Failed";
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;
ntxes += bd.second.size();
@@ -83,10 +83,12 @@ namespace cryptonote
std::list<crypto::hash> block_ids; //*first 10 blocks id goes sequential, next goes in pow(2,n) offset, like 2, 4, 8, 16, 32, 64 and so on, and the last one is always genesis block */
uint64_t start_height;
bool prune;
bool no_miner_tx;
BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE_CONTAINER_POD_AS_BLOB(block_ids)
KV_SERIALIZE(start_height)
KV_SERIALIZE(prune)
KV_SERIALIZE_OPT(no_miner_tx, false)
END_KV_SERIALIZE_MAP()
};

@@ -1684,6 +1684,7 @@ void wallet2::pull_blocks(uint64_t start_height, uint64_t &blocks_start_height,
}

req.start_height = start_height;
req.no_miner_tx = m_refresh_type == RefreshNoCoinbase;
m_daemon_rpc_mutex.lock();
bool r = net_utils::invoke_http_bin("/getblocks.bin", req, res, m_http_client, rpc_timeout);
m_daemon_rpc_mutex.unlock();

0 comments on commit 6795bd0

Please sign in to comment.