diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-08 16:43:54 -0800 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-08 16:43:54 -0800 |
| commit | 15dcc5afd3135ee1e38da05b88c01b94dee5786f (patch) | |
| tree | 8ee929dc3bb6defeda744eb4023a8ff33a1b9617 /src/cryptonote_core/blockchain.cpp | |
| parent | 278562d2c2df90fe56cdc6d7c3082c45795fd0ad (diff) | |
| parent | 1607cb7e0c5cc5e1400766f595e723531a97cb7b (diff) | |
| download | monzero-core-15dcc5afd3135ee1e38da05b88c01b94dee5786f.tar.gz monzero-core-15dcc5afd3135ee1e38da05b88c01b94dee5786f.tar.xz monzero-core-15dcc5afd3135ee1e38da05b88c01b94dee5786f.zip | |
Merge pull request #1534
1607cb7e tx_pool: better block template filling algorithm (moneromooo-monero)
9731b4e5 rpc: add block size to GET_BLOCK_HEADER RPC (moneromooo-monero)
9188b346 rpc: add current block size to the getinfo call (moneromooo-monero)
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 11dbb2fe6..5f9d6937b 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -1085,7 +1085,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; } |