diff options
Diffstat (limited to '')
| -rw-r--r-- | src/wallet/wallet2.h | 311 |
1 files changed, 107 insertions, 204 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index f26f8022e..74de1b6d9 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -8,6 +8,7 @@ #include <boost/serialization/list.hpp> #include <boost/serialization/vector.hpp> #include <atomic> + #include "include_base_utils.h" #include "cryptonote_core/account.h" #include "cryptonote_core/account_boost_serialization.h" @@ -20,38 +21,40 @@ #include "crypto/chacha8.h" #include "crypto/hash.h" +#include "wallet_errors.h" + #define DEFAULT_TX_SPENDABLE_AGE 10 #define WALLET_RCP_CONNECTION_TIMEOUT 200000 namespace tools { - inline std::string interpret_rpc_response(bool ok, const std::string& status) + class i_wallet2_callback { - std::string err; - if (ok) - { - if (status == CORE_RPC_STATUS_BUSY) - { - err = "daemon is busy. Please try later"; - } - else if (status != CORE_RPC_STATUS_OK) - { - err = status; - } - } - else + public: + virtual void on_new_block(uint64_t height, const cryptonote::block& block) {} + virtual void on_money_received(uint64_t height, const cryptonote::transaction& tx, size_t out_index) {} + virtual void on_money_spent(uint64_t height, const cryptonote::transaction& in_tx, size_t out_index, const cryptonote::transaction& spend_tx) {} + }; + + struct tx_dust_policy + { + uint64_t dust_threshold; + bool add_to_fee; + cryptonote::account_public_address addr_for_dust; + + tx_dust_policy(uint64_t a_dust_threshold = 0, bool an_add_to_fee = true, cryptonote::account_public_address an_addr_for_dust = cryptonote::account_public_address()) + : dust_threshold(a_dust_threshold) + , add_to_fee(an_add_to_fee) + , addr_for_dust(an_addr_for_dust) { - err = "possible lost connection to daemon"; } - return err; - } - + }; class wallet2 { - wallet2(const wallet2&) : m_run(true) {}; + wallet2(const wallet2&) : m_run(true), m_callback(0) {}; public: - wallet2() : m_run(true) {}; + wallet2() : m_run(true), m_callback(0) {}; struct transfer_details { uint64_t m_block_height; @@ -63,22 +66,16 @@ namespace tools uint64_t amount() const { return m_tx.vout[m_internal_output_index].amount; } }; - typedef std::vector<transfer_details> transfer_container; - struct tx_dust_policy + struct unconfirmed_transfer_details { - uint64_t dust_threshold; - bool add_to_fee; - cryptonote::account_public_address addr_for_dust; - - tx_dust_policy(uint64_t a_dust_threshold = 0, bool an_add_to_fee = true, cryptonote::account_public_address an_addr_for_dust = cryptonote::account_public_address()) - : dust_threshold(a_dust_threshold) - , add_to_fee(an_add_to_fee) - , addr_for_dust(an_addr_for_dust) - { - } + cryptonote::transaction m_tx; + uint64_t m_change; + time_t m_sent_time; }; + typedef std::vector<transfer_details> transfer_container; + struct keys_file_data { crypto::chacha8_iv iv; @@ -90,77 +87,34 @@ namespace tools END_SERIALIZE() }; - struct fail_details - { - enum fail_reason - { - error_ok = 0, - error_not_connected, - error_daemon_is_busy, - error_rejected_by_daemon, - error_too_big_transaction, - error_not_enough_money, - error_too_big_mixin, - error_to_parse_block, - error_to_parse_tx, - error_to_parse_tx_extra, - error_invalid_tx, - error_internal_error - }; - fail_reason reason; - uint64_t tx_blob_size; - uint64_t max_expected_tx_blob_size; - - std::string what() const - { - switch (reason) - { - case error_ok: return "OK"; - case error_not_connected: return "not connected"; - case error_daemon_is_busy: return "daemon is busy. Please try later"; - case error_rejected_by_daemon: return "rejected by daemon"; - case error_too_big_transaction: return "transaction size is too big"; - case error_not_enough_money: return "not enough money"; - case error_too_big_mixin: return "not enough outputs for specified mixin_count"; - case error_to_parse_block: return "failed to parse/validate block"; - case error_to_parse_tx: return "failed to parse/validate tx"; - case error_to_parse_tx_extra: return "failed to parse/validate tx extra"; - case error_invalid_tx: return "wrong tx"; - case error_internal_error: return "internal error"; - default: return "unknown error"; - } - } - }; - - bool generate(const std::string& wallet, const std::string& password); - bool load(const std::string& wallet, const std::string& password); - bool store(); + void generate(const std::string& wallet, const std::string& password); + void load(const std::string& wallet, const std::string& password); + void store(); cryptonote::account_base& get_account(){return m_account;} - bool init(const std::string& daemon_address = "http://localhost:8080", uint64_t upper_transaction_size_limit = CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE*2 - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE); - - bool refresh(fail_details& fd); - bool refresh(size_t & blocks_fetched, fail_details& fd); - bool refresh(size_t & blocks_fetched, bool& received_money, fail_details& fd); + void init(const std::string& daemon_address = "http://localhost:8080", uint64_t upper_transaction_size_limit = CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE*2 - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE); bool deinit(); void stop() { m_run.store(false, std::memory_order_relaxed); } + i_wallet2_callback* callback() const { return m_callback; } + void callback(i_wallet2_callback* callback) { m_callback = callback; } + + void refresh(); + void refresh(size_t & blocks_fetched); + void refresh(size_t & blocks_fetched, bool& received_money); + bool refresh(size_t & blocks_fetched, bool& received_money, bool& ok); + uint64_t balance(); uint64_t unlocked_balance(); template<typename T> - bool enum_incoming_transfers(const T& handler) const; - template<typename T> - bool transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count, uint64_t unlock_time, uint64_t fee, T destination_split_strategy, const tx_dust_policy& dust_policy); + void transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count, uint64_t unlock_time, uint64_t fee, T destination_split_strategy, const tx_dust_policy& dust_policy); template<typename T> - bool transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count, uint64_t unlock_time, uint64_t fee, T destination_split_strategy, const tx_dust_policy& dust_policy, cryptonote::transaction &tx, fail_details& tfd); - template<typename T> - bool transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count, uint64_t unlock_time, uint64_t fee, T destination_split_strategy, const tx_dust_policy& dust_policy, cryptonote::transaction &tx); - bool transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count, uint64_t unlock_time, uint64_t fee); - bool transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count, uint64_t unlock_time, uint64_t fee, cryptonote::transaction& tx); - bool transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count, uint64_t unlock_time, uint64_t fee, cryptonote::transaction& tx, fail_details& tfd); + void transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count, uint64_t unlock_time, uint64_t fee, T destination_split_strategy, const tx_dust_policy& dust_policy, cryptonote::transaction &tx); + void transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count, uint64_t unlock_time, uint64_t fee); + void transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count, uint64_t unlock_time, uint64_t fee, cryptonote::transaction& tx); bool check_connection(); - bool get_transfers(wallet2::transfer_container& incoming_transfers); + void get_transfers(wallet2::transfer_container& incoming_transfers) const; uint64_t get_blockchain_current_height() const { return m_local_bc_height; } template <class t_archive> inline void serialize(t_archive &a, const unsigned int ver) @@ -171,21 +125,26 @@ namespace tools a & m_transfers; a & m_account_public_address; a & m_key_images; + if(ver < 6) + return; + a & m_unconfirmed_txs; } private: bool store_keys(const std::string& keys_file_name, const std::string& password); - bool load_keys(const std::string& keys_file_name, const std::string& password); - bool process_new_transaction(cryptonote::transaction& tx, uint64_t height, fail_details& fd); - bool process_new_blockchain_entry(cryptonote::block& b, cryptonote::block_complete_entry& bche, crypto::hash& bl_id, uint64_t height, fail_details& fd); - bool detach_blockchain(uint64_t height); - bool get_short_chain_history(std::list<crypto::hash>& ids); + void load_keys(const std::string& keys_file_name, const std::string& password); + void process_new_transaction(const cryptonote::transaction& tx, uint64_t height); + void process_new_blockchain_entry(const cryptonote::block& b, cryptonote::block_complete_entry& bche, crypto::hash& bl_id, uint64_t height); + void detach_blockchain(uint64_t height); + void get_short_chain_history(std::list<crypto::hash>& ids); bool is_tx_spendtime_unlocked(uint64_t unlock_time) const; bool is_transfer_unlocked(const transfer_details& td) const; bool clear(); - bool pull_blocks(size_t& blocks_added, fail_details& fd); + void pull_blocks(size_t& blocks_added); uint64_t select_transfers(uint64_t needed_money, bool add_dust, uint64_t dust, std::list<transfer_container::iterator>& selected_transfers); bool prepare_file_names(const std::string& file_path); + void process_unconfirmed(const cryptonote::transaction& tx); + void add_unconfirmed_tx(const cryptonote::transaction& tx, uint64_t change_amount); cryptonote::account_base m_account; std::string m_daemon_address; @@ -194,6 +153,7 @@ namespace tools epee::net_utils::http::http_simple_client m_http_client; std::vector<crypto::hash> m_blockchain; std::atomic<uint64_t> m_local_bc_height; //temporary workaround + std::unordered_map<crypto::hash, unconfirmed_transfer_details> m_unconfirmed_txs; transfer_container m_transfers; std::unordered_map<crypto::key_image, size_t> m_key_images; @@ -201,9 +161,11 @@ namespace tools uint64_t m_upper_transaction_size_limit; //TODO: auto-calc this value or request from daemon, now use some fixed value std::atomic<bool> m_run; + + i_wallet2_callback* m_callback; }; } -BOOST_CLASS_VERSION(tools::wallet2, 5) +BOOST_CLASS_VERSION(tools::wallet2, 6) namespace boost { @@ -219,6 +181,16 @@ namespace boost a & x.m_spent; a & x.m_key_image; } + + template <class Archive> + inline void serialize(Archive &a, tools::wallet2::unconfirmed_transfer_details &x, const boost::serialization::version_type ver) + { + a & x.m_change; + a & x.m_sent_time; + a & x.m_tx; + } + + } } @@ -288,62 +260,31 @@ namespace tools } //---------------------------------------------------------------------------------------------------- template<typename T> - bool wallet2::enum_incoming_transfers(const T& handler) const - { - if(!m_transfers.empty()) - { - BOOST_FOREACH(const transfer_details& td, m_transfers) - { - handler(td.m_tx, td.m_global_output_index, td.amount(), td.m_spent); - } - return true; - } - else - { - return false; - } - } - //---------------------------------------------------------------------------------------------------- - template<typename T> - bool wallet2::transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count, + void wallet2::transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count, uint64_t unlock_time, uint64_t fee, T destination_split_strategy, const tx_dust_policy& dust_policy) { cryptonote::transaction tx; - return transfer(dsts, fake_outputs_count, unlock_time, fee, destination_split_strategy, dust_policy, tx); + transfer(dsts, fake_outputs_count, unlock_time, fee, destination_split_strategy, dust_policy, tx); } template<typename T> - bool wallet2::transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count, + void wallet2::transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count, uint64_t unlock_time, uint64_t fee, T destination_split_strategy, const tx_dust_policy& dust_policy, cryptonote::transaction &tx) { - fail_details stub = AUTO_VAL_INIT(stub); - return transfer(dsts, fake_outputs_count, unlock_time, fee, destination_split_strategy, dust_policy, tx, stub); - } - - template<typename T> - bool wallet2::transfer(const std::vector<cryptonote::tx_destination_entry>& dsts, size_t fake_outputs_count, - uint64_t unlock_time, uint64_t fee, T destination_split_strategy, const tx_dust_policy& dust_policy, cryptonote::transaction &tx, fail_details& tfd) - { using namespace cryptonote; uint64_t needed_money = fee; BOOST_FOREACH(auto& dt, dsts) { - CHECK_AND_ASSERT_MES(dt.amount > 0, false, "Wrong destination amount value: " << dt.amount); + CHECK_AND_THROW_WALLET_EX(0 == dt.amount, error::zero_destination); needed_money += dt.amount; + CHECK_AND_THROW_WALLET_EX(needed_money < dt.amount, error::tx_sum_overflow, dsts, fee); } std::list<transfer_container::iterator> selected_transfers; uint64_t found_money = select_transfers(needed_money, 0 == fake_outputs_count, dust_policy.dust_threshold, selected_transfers); + CHECK_AND_THROW_WALLET_EX(found_money < needed_money, error::not_enough_money, found_money, needed_money - fee, fee); - if(found_money < needed_money) - { - LOG_ERROR("not enough money, available only " << print_money(found_money) << ", transaction amount " << - print_money(needed_money) << " = " << print_money(needed_money - fee) << " + " << print_money(fee) << " (fee)"); - tfd.reason = fail_details::error_not_enough_money; - return false; - } - //typedef COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::outs_for_amount outs_for_amount; typedef COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::out_entry out_entry; typedef cryptonote::tx_source_entry::output_entry tx_output_entry; @@ -354,41 +295,30 @@ namespace tools req.outs_count = fake_outputs_count + 1;// add one to make possible (if need) to skip real output key BOOST_FOREACH(transfer_container::iterator it, selected_transfers) { - CHECK_AND_ASSERT_MES(it->m_tx.vout.size() > it->m_internal_output_index, false, "internal error: m_internal_output_index = " - << it->m_internal_output_index << " more than " << it->m_tx.vout.size()); + CHECK_AND_THROW_WALLET_EX(it->m_tx.vout.size() <= it->m_internal_output_index, error::wallet_internal_error, + "m_internal_output_index = " + std::to_string(it->m_internal_output_index) + + " is greater or equal to outputs count = " + std::to_string(it->m_tx.vout.size())); req.amounts.push_back(it->amount()); } bool r = net_utils::invoke_http_bin_remote_command2(m_daemon_address + "/getrandom_outs.bin", req, daemon_resp, m_http_client, 200000); - if (!r) tfd.reason = fail_details::error_not_connected; - else if (CORE_RPC_STATUS_BUSY == daemon_resp.status) tfd.reason = fail_details::error_daemon_is_busy; - else if (CORE_RPC_STATUS_OK != daemon_resp.status) tfd.reason = fail_details::error_internal_error; - else tfd.reason = fail_details::error_ok; - if (fail_details::error_ok != tfd.reason) - { - LOG_PRINT_L0("failed to invoke getrandom_outs.bin: " << interpret_rpc_response(r, daemon_resp.status)); - return false; - } - - tfd.reason = fail_details::error_internal_error; - CHECK_AND_ASSERT_MES(daemon_resp.outs.size() == selected_transfers.size(), false, - "internal error: daemon returned wrong response for getrandom_outs.bin, wrong amounts count = " - << daemon_resp.outs.size() << ", expected " << selected_transfers.size()); - - tfd.reason = fail_details::error_ok; + CHECK_AND_THROW_WALLET_EX(!r, error::no_connection_to_daemon, "getrandom_outs.bin"); + CHECK_AND_THROW_WALLET_EX(daemon_resp.status == CORE_RPC_STATUS_BUSY, error::daemon_busy, "getrandom_outs.bin"); + CHECK_AND_THROW_WALLET_EX(daemon_resp.status != CORE_RPC_STATUS_OK, error::get_random_outs_error, daemon_resp.status); + CHECK_AND_THROW_WALLET_EX(daemon_resp.outs.size() != selected_transfers.size(), error::wallet_internal_error, + "daemon returned wrong response for getrandom_outs.bin, wrong amounts count = " + + std::to_string(daemon_resp.outs.size()) + ", expected " + std::to_string(selected_transfers.size())); + + std::vector<COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::outs_for_amount> scanty_outs; BOOST_FOREACH(COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS::outs_for_amount& amount_outs, daemon_resp.outs) { - if (amount_outs.outs.size() != fake_outputs_count) + if (amount_outs.outs.size() < fake_outputs_count) { - tfd.reason = fail_details::error_too_big_mixin; - LOG_PRINT_L0("not enough outputs to mix output " << print_money(amount_outs.amount) << ", requested " << - fake_outputs_count << ", found " << amount_outs.outs.size()); + scanty_outs.push_back(amount_outs); } } - if (fail_details::error_ok != tfd.reason) - return false; + CHECK_AND_THROW_WALLET_EX(!scanty_outs.empty(), error::not_enough_outs_to_mix, scanty_outs, fake_outputs_count); } - tfd.reason = fail_details::error_ok; //prepare inputs size_t i = 0; @@ -443,60 +373,36 @@ namespace tools uint64_t dust = 0; std::vector<cryptonote::tx_destination_entry> splitted_dsts; destination_split_strategy(dsts, change_dts, dust_policy.dust_threshold, splitted_dsts, dust); - CHECK_AND_ASSERT_MES(dust <= dust_policy.dust_threshold, false, "internal error: invalid dust value"); + CHECK_AND_THROW_WALLET_EX(dust_policy.dust_threshold < dust, error::wallet_internal_error, "invalid dust value: dust = " + + std::to_string(dust) + ", dust_threshold = " + std::to_string(dust_policy.dust_threshold)); if (0 != dust && !dust_policy.add_to_fee) { splitted_dsts.push_back(cryptonote::tx_destination_entry(dust, dust_policy.addr_for_dust)); } - tfd.reason = fail_details::error_internal_error; bool r = cryptonote::construct_tx(m_account.get_keys(), sources, splitted_dsts, tx, unlock_time); - CHECK_AND_ASSERT_MES(r, false, "Transaction construction failed"); + CHECK_AND_THROW_WALLET_EX(!r, error::tx_not_constructed, sources, splitted_dsts, unlock_time); + CHECK_AND_THROW_WALLET_EX(m_upper_transaction_size_limit <= get_object_blobsize(tx), error::tx_too_big, tx, m_upper_transaction_size_limit); - //check transaction size - if(get_object_blobsize(tx) >= m_upper_transaction_size_limit) + std::string key_images; + bool all_are_txin_to_key = std::all_of(tx.vin.begin(), tx.vin.end(), [&](const txin_v& s_e) -> bool { - LOG_PRINT_L0("Transaction size is too big: " << get_object_blobsize(tx) << ", expected size < " << m_upper_transaction_size_limit); - tfd.reason = fail_details::error_too_big_transaction; - tfd.tx_blob_size = get_object_blobsize(tx); - tfd.max_expected_tx_blob_size = m_upper_transaction_size_limit; - return false; - } + CHECKED_GET_SPECIFIC_VARIANT(s_e, const txin_to_key, in, false); + key_images += boost::to_string(in.k_image) + " "; + return true; + }); + CHECK_AND_THROW_WALLET_EX(!all_are_txin_to_key, error::unexpected_txin_type, tx); COMMAND_RPC_SEND_RAW_TX::request req; req.tx_as_hex = epee::string_tools::buff_to_hex_nodelimer(tx_to_blob(tx)); COMMAND_RPC_SEND_RAW_TX::response daemon_send_resp; r = net_utils::invoke_http_json_remote_command2(m_daemon_address + "/sendrawtransaction", req, daemon_send_resp, m_http_client, 200000); - if (!r) - { - tfd.reason = fail_details::error_not_connected; - LOG_PRINT_L0("failed to send transaction: " << interpret_rpc_response(r, daemon_send_resp.status)); - return false; - } - else if (CORE_RPC_STATUS_BUSY == daemon_send_resp.status) - { - tfd.reason = fail_details::error_daemon_is_busy; - LOG_PRINT_L0("failed to send transaction: " << interpret_rpc_response(r, daemon_send_resp.status)); - return false; - } - else if (CORE_RPC_STATUS_OK != daemon_send_resp.status) - { - tfd.reason = fail_details::error_rejected_by_daemon; - LOG_ERROR("daemon failed to accept generated transaction, id: " << get_transaction_hash(tx)); - return false; - } - else - { - tfd.reason = fail_details::error_ok; - } + CHECK_AND_THROW_WALLET_EX(!r, error::no_connection_to_daemon, "sendrawtransaction"); + CHECK_AND_THROW_WALLET_EX(daemon_send_resp.status == CORE_RPC_STATUS_BUSY, error::daemon_busy, "sendrawtransaction"); + CHECK_AND_THROW_WALLET_EX(daemon_send_resp.status != CORE_RPC_STATUS_OK, error::tx_rejected, tx, daemon_send_resp.status); + + add_unconfirmed_tx(tx, change_dts.amount); - std::string key_images; - std::for_each(tx.vin.begin(), tx.vin.end(), [&](const txin_v& s_e) -> bool - { - CHECKED_GET_SPECIFIC_VARIANT(s_e, const txin_to_key, in, false); - key_images += boost::to_string(in.k_image) + " "; - return true; - }); LOG_PRINT_L2("transaction " << get_transaction_hash(tx) << " generated ok and sent to daemon, key_images: [" << key_images << "]"); BOOST_FOREACH(transfer_container::iterator it, selected_transfers) @@ -507,8 +413,5 @@ namespace tools << "Balance: " << print_money(balance()) << ENDL << "Unlocked: " << print_money(unlocked_balance()) << ENDL << "Please, wait for confirmation for your balance to be unlocked."); - - tfd.reason = fail_details::error_ok; - return true; } } |