diff options
Diffstat (limited to 'src')
24 files changed, 74 insertions, 38 deletions
diff --git a/src/blockchain_utilities/CMakeLists.txt b/src/blockchain_utilities/CMakeLists.txt index 198f15ca3..a9ece98fc 100644 --- a/src/blockchain_utilities/CMakeLists.txt +++ b/src/blockchain_utilities/CMakeLists.txt @@ -124,5 +124,5 @@ add_dependencies(cn_deserialize version) set_property(TARGET cn_deserialize PROPERTY - OUTPUT_NAME "cn_deserialize") + OUTPUT_NAME "monero-utils-deserialize") diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat Binary files differindex 24cfffa38..a15f53e67 100644 --- a/src/blocks/checkpoints.dat +++ b/src/blocks/checkpoints.dat diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index efda3f5cf..70b2ccc79 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -759,6 +759,9 @@ bool Blockchain::rollback_blockchain_switching(std::list<block>& original_chain, pop_block_from_blockchain(); } + // make sure the hard fork object updates its current version + m_hardfork->reorganize_from_chain_height(rollback_height); + //return back original chain for (auto& bl : original_chain) { diff --git a/src/cryptonote_core/checkpoints.cpp b/src/cryptonote_core/checkpoints.cpp index 1d5959c46..dc1912856 100644 --- a/src/cryptonote_core/checkpoints.cpp +++ b/src/cryptonote_core/checkpoints.cpp @@ -186,6 +186,9 @@ namespace cryptonote ADD_CHECKPOINT(913193, "5292d5d56f6ba4de33a58d9a34d263e2cb3c6fee0aed2286fd4ac7f36d53c85f"); ADD_CHECKPOINT(1000000, "a886ef5149902d8342475fee9bb296341b891ac67c4842f47a833f23c00ed721"); ADD_CHECKPOINT(1100000, "3fd720c5c8b3072fc1ccda922dec1ef25f9ed88a1e6ad4103d0fe00b180a5903"); + ADD_CHECKPOINT(1150000, "1dd16f626d18e1e988490dfd06de5920e22629c972c58b4d8daddea0038627b2"); + ADD_CHECKPOINT(1200000, "fa7d13a90850882060479d100141ff84286599ae39c3277c8ea784393f882d1f"); + return true; } diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl index f0f9102a8..b13c1f437 100644 --- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl +++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl @@ -285,7 +285,7 @@ namespace cryptonote int64_t last_block_v1 = 1009826; int64_t diff_v2 = max_block_height > last_block_v1 ? min(abs(diff), max_block_height - last_block_v1) : 0; LOG_PRINT_CCONTEXT_YELLOW("Sync data returned a new top block candidate: " << m_core.get_current_blockchain_height() << " -> " << hshd.current_height - << " [" << std::abs(diff) << " Your node is (" << ((abs(diff) - diff_v2) / (24 * 60 * 60 / DIFFICULTY_TARGET_V1)) + (diff_v2 / (24 * 60 * 60 / DIFFICULTY_TARGET_V2)) << " days) " + << " [Your node is " << std::abs(diff) << " blocks (" << ((abs(diff) - diff_v2) / (24 * 60 * 60 / DIFFICULTY_TARGET_V1)) + (diff_v2 / (24 * 60 * 60 / DIFFICULTY_TARGET_V2)) << " days) " << (0 <= diff ? std::string("behind") : std::string("ahead")) << "] " << ENDL << "SYNCHRONIZATION started", (is_inital ? LOG_LEVEL_0:LOG_LEVEL_1)); LOG_PRINT_L1("Remote blockchain height: " << hshd.current_height << ", id: " << hshd.top_id); diff --git a/src/ringct/rctSigs.cpp b/src/ringct/rctSigs.cpp index b7efe3ae7..c7f9b6879 100644 --- a/src/ringct/rctSigs.cpp +++ b/src/ringct/rctSigs.cpp @@ -750,7 +750,7 @@ namespace rct { for (size_t i = 0; i < rv.outPk.size(); ++i) { if (!results[i]) { - LOG_ERROR("Range proof verified failed for input " << i); + LOG_PRINT_L1("Range proof verified failed for output " << i); return false; } } @@ -761,7 +761,7 @@ namespace rct { DP("mg sig verified?"); DP(mgVerd); if (!mgVerd) { - LOG_ERROR("MG signature verification failed"); + LOG_PRINT_L1("MG signature verification failed"); return false; } @@ -803,7 +803,7 @@ namespace rct { for (size_t i = 0; i < results.size(); ++i) { if (!results[i]) { - LOG_ERROR("Range proof verified failed for input " << i); + LOG_PRINT_L1("Range proof verified failed for output " << i); return false; } } @@ -830,7 +830,7 @@ namespace rct { for (size_t i = 0; i < results.size(); ++i) { if (!results[i]) { - LOG_ERROR("verRctMGSimple failed for input " << i); + LOG_PRINT_L1("verRctMGSimple failed for input " << i); return false; } } @@ -843,7 +843,7 @@ namespace rct { //check pseudoOuts vs Outs.. if (!equalKeys(sumPseudoOuts, sumOutpks)) { - LOG_ERROR("Sum check failed"); + LOG_PRINT_L1("Sum check failed"); return false; } diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index d9c1bb4ed..85bdee16f 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -869,8 +869,10 @@ bool simple_wallet::ask_wallet_create_if_needed() do{ LOG_PRINT_L3("User asked to specify wallet file name."); wallet_path = command_line::input_line( - tr("Specify wallet file name (e.g., MyWallet). If the wallet doesn't exist, it will be created.\n" - "Wallet file name (or Ctrl-C to quit): ") + tr(m_restoring ? "Specify a new wallet file name for your restored wallet (e.g., MyWallet).\n" + "Wallet file name (or Ctrl-C to quit): " : + "Specify wallet file name (e.g., MyWallet). If the wallet doesn't exist, it will be created.\n" + "Wallet file name (or Ctrl-C to quit): ") ); if(std::cin.eof()) { @@ -913,8 +915,8 @@ bool simple_wallet::ask_wallet_create_if_needed() } else if(!wallet_file_exists && !keys_file_exists) //No wallet, no keys { - message_writer() << tr("No wallet/key file found with that name. Confirm creation of new wallet named: ") << wallet_path; - confirm_creation = command_line::input_line(tr("(y)es/(n)o: ")); + message_writer() << tr(m_restoring ? "Confirm wallet name: " : "No wallet found with that name. Confirm creation of new wallet named: ") << wallet_path; + confirm_creation = command_line::input_line(tr("(Y/Yes/N/No): ")); if(std::cin.eof()) { LOG_ERROR("Unexpected std::cin.eof() - Exited simple_wallet::ask_wallet_create_if_needed()"); @@ -2178,7 +2180,7 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri // prompt is there is no payment id and confirmation is required if (!payment_id_seen && m_wallet->confirm_missing_payment_id()) { - std::string accepted = command_line::input_line(tr("No payment id is included with this transaction. Is this okay? (Y/Yes/N/No)")); + std::string accepted = command_line::input_line(tr("No payment id is included with this transaction. Is this okay? (Y/Yes/N/No): ")); if (std::cin.eof()) return true; if (!command_line::is_yes(accepted)) @@ -2260,7 +2262,7 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri float days = locked_blocks / 720.0f; prompt << boost::format(tr(".\nThis transaction will unlock on block %llu, in approximately %s days (assuming 2 minutes per block)")) % ((unsigned long long)unlock_block) % days; } - prompt << tr(".") << ENDL << tr("Is this okay? (Y/Yes/N/No)"); + prompt << tr(".") << ENDL << tr("Is this okay? (Y/Yes/N/No): "); std::string accepted = command_line::input_line(prompt.str()); if (std::cin.eof()) @@ -2431,13 +2433,13 @@ bool simple_wallet::sweep_unmixable(const std::vector<std::string> &args_) std::string prompt_str = tr("Sweeping ") + print_money(total_unmixable); if (ptx_vector.size() > 1) { - prompt_str = (boost::format(tr("Sweeping %s in %llu transactions for a total fee of %s. Is this okay? (Y/Yes/N/No)")) % + prompt_str = (boost::format(tr("Sweeping %s in %llu transactions for a total fee of %s. Is this okay? (Y/Yes/N/No): ")) % print_money(total_unmixable) % ((unsigned long long)ptx_vector.size()) % print_money(total_fee)).str(); } else { - prompt_str = (boost::format(tr("Sweeping %s for a total fee of %s. Is this okay? (Y/Yes/N/No)")) % + prompt_str = (boost::format(tr("Sweeping %s for a total fee of %s. Is this okay? (Y/Yes/N/No): ")) % print_money(total_unmixable) % print_money(total_fee)).str(); } @@ -2655,7 +2657,7 @@ bool simple_wallet::sweep_all(const std::vector<std::string> &args_) // prompt is there is no payment id and confirmation is required if (!payment_id_seen && m_wallet->confirm_missing_payment_id()) { - std::string accepted = command_line::input_line(tr("No payment id is included with this transaction. Is this okay? (Y/Yes/N/No)")); + std::string accepted = command_line::input_line(tr("No payment id is included with this transaction. Is this okay? (Y/Yes/N/No): ")); if (std::cin.eof()) return true; if (!command_line::is_yes(accepted)) @@ -2690,7 +2692,7 @@ bool simple_wallet::sweep_all(const std::vector<std::string> &args_) std::string prompt_str; if (ptx_vector.size() > 1) { - prompt_str = (boost::format(tr("Sweeping %s in %llu transactions for a total fee of %s. Is this okay? (Y/Yes/N/No)")) % + prompt_str = (boost::format(tr("Sweeping %s in %llu transactions for a total fee of %s. Is this okay? (Y/Yes/N/No): ")) % print_money(total_sent) % ((unsigned long long)ptx_vector.size()) % print_money(total_fee)).str(); @@ -2897,7 +2899,7 @@ bool simple_wallet::accept_loaded_tx(const std::function<size_t()> get_num_txes, change_string += tr("no change"); uint64_t fee = amount - amount_to_dests; - std::string prompt_str = (boost::format(tr("Loaded %lu transactions, for %s, fee %s, %s, %s, with min mixin %lu. %sIs this okay? (Y/Yes/N/No)")) % (unsigned long)get_num_txes() % print_money(amount) % print_money(fee) % dest_string % change_string % (unsigned long)min_mixin % extra_message).str(); + std::string prompt_str = (boost::format(tr("Loaded %lu transactions, for %s, fee %s, %s, %s, with min mixin %lu. %sIs this okay? (Y/Yes/N/No): ")) % (unsigned long)get_num_txes() % print_money(amount) % print_money(fee) % dest_string % change_string % (unsigned long)min_mixin % extra_message).str(); return command_line::is_yes(command_line::input_line(prompt_str)); } //---------------------------------------------------------------------------------------------------- diff --git a/src/version.h.in b/src/version.h.in index c1eca54b8..43e046f24 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -1,4 +1,4 @@ #define MONERO_VERSION_TAG "@VERSIONTAG@" -#define MONERO_VERSION "0.10.0.0" +#define MONERO_VERSION "0.10.1.0" #define MONERO_RELEASE_NAME "Wolfram Warptangent" #define MONERO_VERSION_FULL MONERO_VERSION "-" MONERO_VERSION_TAG diff --git a/src/wallet/api/address_book.cpp b/src/wallet/api/address_book.cpp index edeb5bb46..1847e1496 100644 --- a/src/wallet/api/address_book.cpp +++ b/src/wallet/api/address_book.cpp @@ -36,7 +36,7 @@ #include <vector> -namespace Bitmonero { +namespace Monero { AddressBook::~AddressBook() {} @@ -126,4 +126,6 @@ AddressBookImpl::~AddressBookImpl() clearRows(); } -} // namespace
\ No newline at end of file +} // namespace + +namespace Bitmonero = Monero;
\ No newline at end of file diff --git a/src/wallet/api/address_book.h b/src/wallet/api/address_book.h index 470dfdcfb..c3a24eff9 100644 --- a/src/wallet/api/address_book.h +++ b/src/wallet/api/address_book.h @@ -31,7 +31,7 @@ #include "wallet/wallet2_api.h" #include "wallet/wallet2.h" -namespace Bitmonero { +namespace Monero { class AddressBookRow; class WalletImpl; @@ -65,3 +65,5 @@ private: } +namespace Bitmonero = Monero; + diff --git a/src/wallet/api/pending_transaction.cpp b/src/wallet/api/pending_transaction.cpp index 2521decea..6586d0c48 100644 --- a/src/wallet/api/pending_transaction.cpp +++ b/src/wallet/api/pending_transaction.cpp @@ -43,7 +43,7 @@ using namespace std; -namespace Bitmonero { +namespace Monero { PendingTransaction::~PendingTransaction() {} @@ -149,3 +149,5 @@ uint64_t PendingTransactionImpl::txCount() const } +namespace Bitmonero = Monero; + diff --git a/src/wallet/api/pending_transaction.h b/src/wallet/api/pending_transaction.h index c5e847c97..47ccdec76 100644 --- a/src/wallet/api/pending_transaction.h +++ b/src/wallet/api/pending_transaction.h @@ -35,7 +35,7 @@ #include <vector> -namespace Bitmonero { +namespace Monero { class WalletImpl; class PendingTransactionImpl : public PendingTransaction @@ -64,3 +64,5 @@ private: } + +namespace Bitmonero = Monero; diff --git a/src/wallet/api/transaction_history.cpp b/src/wallet/api/transaction_history.cpp index 603739598..5f52438cd 100644 --- a/src/wallet/api/transaction_history.cpp +++ b/src/wallet/api/transaction_history.cpp @@ -42,7 +42,7 @@ using namespace epee; -namespace Bitmonero { +namespace Monero { TransactionHistory::~TransactionHistory() {} @@ -209,3 +209,5 @@ void TransactionHistoryImpl::refresh() } } // namespace + +namespace Bitmonero = Monero; diff --git a/src/wallet/api/transaction_history.h b/src/wallet/api/transaction_history.h index 1b6617ead..bd18e9440 100644 --- a/src/wallet/api/transaction_history.h +++ b/src/wallet/api/transaction_history.h @@ -31,7 +31,7 @@ #include "wallet/wallet2_api.h" #include <boost/thread/shared_mutex.hpp> -namespace Bitmonero { +namespace Monero { class TransactionInfo; class WalletImpl; @@ -57,3 +57,5 @@ private: } +namespace Bitmonero = Monero; + diff --git a/src/wallet/api/transaction_info.cpp b/src/wallet/api/transaction_info.cpp index f25c53a90..8d26f2035 100644 --- a/src/wallet/api/transaction_info.cpp +++ b/src/wallet/api/transaction_info.cpp @@ -33,7 +33,7 @@ using namespace std; -namespace Bitmonero { +namespace Monero { TransactionInfo::~TransactionInfo() {} @@ -110,3 +110,5 @@ const std::vector<TransactionInfo::Transfer> &TransactionInfoImpl::transfers() c } } // namespace + +namespace Bitmonero = Monero; diff --git a/src/wallet/api/transaction_info.h b/src/wallet/api/transaction_info.h index 82ab2cc6b..14efebac4 100644 --- a/src/wallet/api/transaction_info.h +++ b/src/wallet/api/transaction_info.h @@ -32,7 +32,7 @@ #include <string> #include <ctime> -namespace Bitmonero { +namespace Monero { class TransactionHistoryImpl; @@ -73,3 +73,5 @@ private: }; } // namespace + +namespace Bitmonero = Monero; diff --git a/src/wallet/api/utils.cpp b/src/wallet/api/utils.cpp index 7de9d1927..0d30b61cd 100644 --- a/src/wallet/api/utils.cpp +++ b/src/wallet/api/utils.cpp @@ -36,7 +36,7 @@ using namespace std; -namespace Bitmonero { +namespace Monero { namespace Utils { @@ -81,3 +81,5 @@ bool isAddressLocal(const std::string &address) } // namespace + +namespace Bitmonero = Monero; diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index 5b7a3e286..6d8e48deb 100644 --- a/src/wallet/api/wallet.cpp +++ b/src/wallet/api/wallet.cpp @@ -43,7 +43,7 @@ using namespace std; using namespace cryptonote; -namespace Bitmonero { +namespace Monero { namespace { // copy-pasted from simplewallet @@ -1059,3 +1059,5 @@ void WalletImpl::doInit(const string &daemon_address, uint64_t upper_transaction } } // namespace + +namespace Bitmonero = Monero; diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h index 6fbb0da90..5046fbf0f 100644 --- a/src/wallet/api/wallet.h +++ b/src/wallet/api/wallet.h @@ -40,7 +40,7 @@ #include <boost/thread/condition_variable.hpp> -namespace Bitmonero { +namespace Monero { class TransactionHistoryImpl; class PendingTransactionImpl; class AddressBookImpl; @@ -156,5 +156,7 @@ private: } // namespace +namespace Bitmonero = Monero; + #endif diff --git a/src/wallet/api/wallet_manager.cpp b/src/wallet/api/wallet_manager.cpp index 40afc87e9..5a6f02b01 100644 --- a/src/wallet/api/wallet_manager.cpp +++ b/src/wallet/api/wallet_manager.cpp @@ -42,7 +42,7 @@ namespace epee { unsigned int g_test_dbg_lock_sleep = 0; } -namespace Bitmonero { +namespace Monero { Wallet *WalletManagerImpl::createWallet(const std::string &path, const std::string &password, const std::string &language, bool testnet) @@ -375,3 +375,5 @@ void WalletManagerFactory::setLogLevel(int level) } + +namespace Bitmonero = Monero; diff --git a/src/wallet/api/wallet_manager.h b/src/wallet/api/wallet_manager.h index d454548f8..fe9662534 100644 --- a/src/wallet/api/wallet_manager.h +++ b/src/wallet/api/wallet_manager.h @@ -32,7 +32,7 @@ #include "wallet/wallet2_api.h" #include <string> -namespace Bitmonero { +namespace Monero { class WalletManagerImpl : public WalletManager { @@ -61,3 +61,5 @@ private: }; } // namespace + +namespace Bitmonero = Monero; diff --git a/src/wallet/password_container.cpp b/src/wallet/password_container.cpp index 480d132e7..5260bbc8b 100644 --- a/src/wallet/password_container.cpp +++ b/src/wallet/password_container.cpp @@ -144,19 +144,19 @@ bool password_container::read_from_tty_double_check(const char *message) { std::string pass2; bool match=false; bool doNotVerifyEntry=false; + if (m_verify){message = "Enter a password for your new wallet";} do{ if (message) std::cout << message <<": "; if (!password_container::read_from_tty(pass1)) return false; if (m_verify==true){//double check password; - if (message) - std::cout << message << ": "; + std::cout << "Confirm Password: "; if (!password_container::read_from_tty(pass2)) return false; if(pass1!=pass2){ //new password entered did not match - std::cout << "Passwords do not match" << std::endl; + std::cout << "Passwords do not match! Please try again." << std::endl; pass1=""; pass2=""; match=false; diff --git a/src/wallet/password_container.h b/src/wallet/password_container.h index 62f43aa37..866d170f2 100644 --- a/src/wallet/password_container.h +++ b/src/wallet/password_container.h @@ -48,7 +48,7 @@ namespace tools bool empty() const { return m_empty; } const std::string& password() const { return m_password; } void password(std::string&& val) { m_password = std::move(val); m_empty = false; } - bool read_password(const char *message = "password"); + bool read_password(const char *message = "Password"); private: //delete constructor with no parameters diff --git a/src/wallet/wallet2_api.h b/src/wallet/wallet2_api.h index 2e19f36cd..cd2e7230a 100644 --- a/src/wallet/wallet2_api.h +++ b/src/wallet/wallet2_api.h @@ -37,7 +37,7 @@ #include <iostream> // Public interface for libwallet library -namespace Bitmonero { +namespace Monero { namespace Utils { bool isAddressLocal(const std::string &hostaddr); @@ -576,3 +576,5 @@ struct WalletManagerFactory } +namespace Bitmonero = Monero; + |