diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-01-06 20:34:37 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-01-07 12:36:22 +0000 |
| commit | 1607cb7e0c5cc5e1400766f595e723531a97cb7b (patch) | |
| tree | 38498d6406f823cb0f34bfc1b5b8ef12bf6dcc17 /src/cryptonote_core/blockchain.cpp | |
| parent | rpc: add block size to GET_BLOCK_HEADER RPC (diff) | |
| download | monero-1607cb7e0c5cc5e1400766f595e723531a97cb7b.tar.xz | |
tx_pool: better block template filling algorithm
Continue filling until we reach the block size limit, or the
resulting coinbase decreases.
Also remove old sanity check on block size, which is now not
wanted anymore.
Diffstat (limited to 'src/cryptonote_core/blockchain.cpp')
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 42279184a..0fad742f9 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -1084,7 +1084,7 @@ bool Blockchain::create_block_template(block& b, const account_public_address& m size_t txs_size; uint64_t fee; - if (!m_tx_pool.fill_block_template(b, median_size, already_generated_coins, txs_size, fee)) + if (!m_tx_pool.fill_block_template(b, median_size, already_generated_coins, txs_size, fee, m_hardfork->get_current_version())) { return false; } |