diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-08-14 15:31:52 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-08-14 15:31:52 -0500 |
| commit | 564bb1da3a760834e306906a78301e3be93d9836 (patch) | |
| tree | 801f83e7f9ace634c47b403eddac2a2b6762ff87 /src/cryptonote_core/blockchain.h | |
| parent | 1ed2c4043679a2b1ad3713cf961ea12091e72cc2 (diff) | |
| parent | 880ebfdeeaceab5e1ca40b748516987e9c6cecb7 (diff) | |
| download | monzero-core-564bb1da3a760834e306906a78301e3be93d9836.tar.gz monzero-core-564bb1da3a760834e306906a78301e3be93d9836.tar.xz monzero-core-564bb1da3a760834e306906a78301e3be93d9836.zip | |
Merge pull request #5525
0605406 daemon: sort alt chains by height (moneromooo-monero)
4228ee0 daemon: add optional arguments to alt_chain_info (moneromooo-monero)
880ebfd daemon: add more chain specific info in alt_chain_info (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core/blockchain.h')
| -rw-r--r-- | src/cryptonote_core/blockchain.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cryptonote_core/blockchain.h b/src/cryptonote_core/blockchain.h index b1c23b704..d95f2dceb 100644 --- a/src/cryptonote_core/blockchain.h +++ b/src/cryptonote_core/blockchain.h @@ -950,9 +950,9 @@ namespace cryptonote /** * @brief returns a set of known alternate chains * - * @return a list of chains + * @return a vector of chains */ - std::list<std::pair<block_extended_info,std::vector<crypto::hash>>> get_alternative_chains() const; + std::vector<std::pair<block_extended_info,std::vector<crypto::hash>>> get_alternative_chains() const; void add_txpool_tx(const crypto::hash &txid, const cryptonote::blobdata &blob, const txpool_tx_meta_t &meta); void update_txpool_tx(const crypto::hash &txid, const txpool_tx_meta_t &meta); |