diff options
| -rw-r--r-- | README.md | 5 | ||||
| -rw-r--r-- | contrib/epee/src/string_tools.cpp | 1 | ||||
| -rw-r--r-- | src/cryptonote_core/tx_pool.cpp | 2 |
3 files changed, 5 insertions, 3 deletions
@@ -89,8 +89,9 @@ Dates are provided in the format YYYY-MM-DD. | Fork Date | Consensus version | Minimum Monero Version | Recommended Monero Version | Details | | ----------------- | ----------------- | ---------------------- | -------------------------- | ------------------ | | 2016-09-21 | v3 | v0.9.4 | v0.10.0 | Splits coinbase into denominations | -| 2017-01-05 | v4 | v0.10.1 | v0.10.2.2 | Allow normal and RingCT transactions | -| 2017-09-21 | v5 | Not determined as of 2017-03-06 | Not determined as of 2017-03-06 | Allow only RingCT transactions | +| 2017-01-05 | v4 | v0.10.1 | v0.10.2.1 | Allow normal and RingCT transactions | +| 2017-04-15 | v5 | v0.10.2.1 | v0.10.3 | Adjusted minimum blocksize and fee algorithm | +| 2017-09-21 | v6 | Not determined as of 2017-03-06 | Not determined as of 2017-03-06 | Allow only RingCT transactions | ## Installing Monero from a Package diff --git a/contrib/epee/src/string_tools.cpp b/contrib/epee/src/string_tools.cpp index c861cb1d6..d04b16b75 100644 --- a/contrib/epee/src/string_tools.cpp +++ b/contrib/epee/src/string_tools.cpp @@ -30,6 +30,7 @@ # include <winsock2.h> #else # include <arpa/inet.h> +# include <netinet/in.h> #endif namespace epee diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp index ea19b6b48..810d76c48 100644 --- a/src/cryptonote_core/tx_pool.cpp +++ b/src/cryptonote_core/tx_pool.cpp @@ -614,7 +614,7 @@ namespace cryptonote CRITICAL_REGION_LOCAL(m_transactions_lock); - uint64_t best_coinbase = 0, coinbase; + uint64_t best_coinbase = 0, coinbase = 0; total_size = 0; fee = 0; |