diff --git a/src/wallet/core_default_rpc_proxy.h b/src/wallet/core_default_rpc_proxy.h index c44f8d27..7eb94397 100644 --- a/src/wallet/core_default_rpc_proxy.h +++ b/src/wallet/core_default_rpc_proxy.h @@ -28,7 +28,7 @@ namespace tools bool set_connection_addr(const std::string& url) override; - void set_connectivity(unsigned int connection_timeout, size_t repeats_count); + void set_connectivity(unsigned int connection_timeout, size_t repeats_count) override; bool call_COMMAND_RPC_GET_TX_GLOBAL_OUTPUTS_INDEXES(const currency::COMMAND_RPC_GET_TX_GLOBAL_OUTPUTS_INDEXES::request& rqt, currency::COMMAND_RPC_GET_TX_GLOBAL_OUTPUTS_INDEXES::response& rsp) override; bool call_COMMAND_RPC_GET_BLOCKS_FAST(const currency::COMMAND_RPC_GET_BLOCKS_FAST::request& rqt, currency::COMMAND_RPC_GET_BLOCKS_FAST::response& rsp) override; bool call_COMMAND_RPC_GET_BLOCKS_DIRECT(const currency::COMMAND_RPC_GET_BLOCKS_DIRECT::request& rqt, currency::COMMAND_RPC_GET_BLOCKS_DIRECT::response& rsp) override; diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index ed88296c..c554e8d5 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -2225,7 +2225,7 @@ bool wallet2::get_bare_unspent_outputs_stats(std::vector= MAX_INPUTS_FOR_SIMPLE_TX_EURISTIC) tids_grouped_by_txs.emplace_back(); - tids_grouped_by_txs.back().tids.push_back(tid); + tids_grouped_by_txs.back().tids.push_back((uint64_t)tid); tids_grouped_by_txs.back().total_amount += m_transfers[tid].m_amount; } } @@ -2264,7 +2264,7 @@ bool wallet2::get_bare_unspent_outputs_stats(std::vectorfirst >= min_required_amount, "jt->first=" << jt->first << ", min_required_amount=" << min_required_amount); if (used_zc_outs.count(jt->second) == 0) { - group.tids.push_back(jt->second); + group.tids.push_back((uint64_t)jt->second); used_zc_outs.insert(jt->second); group.additional_tid = true; group.additional_tid_amount = jt->first; diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index aae4d6fd..a44b69fa 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -346,7 +346,7 @@ namespace tools struct batch_of_bare_unspent_outs { - std::vector tids; + std::vector tids; uint64_t total_amount = 0; bool additional_tid = false; // additional zc transfer if total_amount < min fee uint64_t additional_tid_amount = 0; diff --git a/src/wallet/wallets_manager.h b/src/wallet/wallets_manager.h index d07c3000..60ea6fee 100644 --- a/src/wallet/wallets_manager.h +++ b/src/wallet/wallets_manager.h @@ -195,12 +195,12 @@ private: bool do_exception_safe_call(guarded_code_t guarded_code, error_prefix_maker_t error_prefix_maker, std::string& api_return_code_result); //----- i_backend_wallet_callback ------ - virtual void on_new_block(size_t wallet_id, uint64_t height, const currency::block& block); - virtual void on_transfer2(size_t wallet_id, const tools::wallet_public::wallet_transfer_info& wti, const std::list& balances, uint64_t total_mined); - virtual void on_pos_block_found(size_t wallet_id, const currency::block& /*block*/); - virtual void on_sync_progress(size_t wallet_id, const uint64_t& /*percents*/); - virtual void on_transfer_canceled(size_t wallet_id, const tools::wallet_public::wallet_transfer_info& wti); - virtual void on_tor_status_change(size_t wallet_id, const std::string& state); + virtual void on_new_block(size_t wallet_id, uint64_t height, const currency::block& block) override; + virtual void on_transfer2(size_t wallet_id, const tools::wallet_public::wallet_transfer_info& wti, const std::list& balances, uint64_t total_mined) override; + virtual void on_pos_block_found(size_t wallet_id, const currency::block& /*block*/) override; + virtual void on_sync_progress(size_t wallet_id, const uint64_t& /*percents*/) override; + virtual void on_transfer_canceled(size_t wallet_id, const tools::wallet_public::wallet_transfer_info& wti) override; + virtual void on_tor_status_change(size_t wallet_id, const std::string& state) override; virtual void on_mw_get_wallets(std::vector& wallets) override; virtual bool on_mw_select_wallet(uint64_t wallet_id) override;