diff options
| author | Thomas Winget <tewinget@gmail.com> | 2015-03-29 09:58:18 -0400 |
|---|---|---|
| committer | Thomas Winget <tewinget@gmail.com> | 2015-03-29 09:58:18 -0400 |
| commit | 94cb295db4fad7ab3deb0fe50bab4bc9223665c0 (patch) | |
| tree | c656a2e3800023e325b871d9d2a3ca6a1d968296 /src/cryptonote_core/blockchain_storage.h | |
| parent | Merge BerkeleyDB blockchain db implementation (diff) | |
| parent | Merge pull request #247 (diff) | |
| download | monero-94cb295db4fad7ab3deb0fe50bab4bc9223665c0.tar.xz | |
Merge upstream into blockchain
Diffstat (limited to 'src/cryptonote_core/blockchain_storage.h')
| -rw-r--r-- | src/cryptonote_core/blockchain_storage.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_core/blockchain_storage.h b/src/cryptonote_core/blockchain_storage.h index 25e6b2453..cbbcd8395 100644 --- a/src/cryptonote_core/blockchain_storage.h +++ b/src/cryptonote_core/blockchain_storage.h @@ -239,7 +239,7 @@ namespace cryptonote bool validate_miner_transaction(const block& b, size_t cumulative_block_size, uint64_t fee, uint64_t& base_reward, uint64_t already_generated_coins) const; bool validate_transaction(const block& b, uint64_t height, const transaction& tx) const; bool rollback_blockchain_switching(std::list<block>& original_chain, size_t rollback_height); - bool add_transaction_from_block(const transaction& tx, const crypto::hash& tx_id, const crypto::hash& bl_id, uint64_t bl_height); + bool add_transaction_from_block(const transaction& tx, const crypto::hash& tx_id, const crypto::hash& bl_id, uint64_t bl_height, size_t blob_size); bool push_transaction_to_global_outs_index(const transaction& tx, const crypto::hash& tx_id, std::vector<uint64_t>& global_indexes); bool pop_transaction_from_global_index(const transaction& tx, const crypto::hash& tx_id); bool get_last_n_blocks_sizes(std::vector<size_t>& sz, size_t count) const; |