Merge pull request #3973

50af357 alt_chain_info can now give more info about a particular alt chain (moneromooo-monero)
2018-07-19 13:37:10 -05:00
parent 025187e6c9 50af3579ee
commit d518dae4bf
8 changed files with 56 additions and 18 deletions
@@ -947,7 +947,7 @@ namespace cryptonote
     *
     * @return a list of chains
     */
-    std::list<std::pair<block_extended_info,uint64_t>> get_alternative_chains() const;
+    std::list<std::pair<block_extended_info,std::vector<crypto::hash>>> get_alternative_chains() const;

    void add_txpool_tx(transaction &tx, const txpool_tx_meta_t &meta);
    void update_txpool_tx(const crypto::hash &txid, const txpool_tx_meta_t &meta);