Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

yet another attempt to fix macOS warnings and errors

Browse source
This commit is contained in:
sowle 2024-04-04 19:03:55 +02:00
parent 60e8fcdc47
commit ea7e99f7d3
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/wallet/core_default_rpc_proxy.h
View file

@ -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;

4
src/wallet/wallet2.cpp
View file

@ -2225,7 +2225,7 @@ bool wallet2::get_bare_unspent_outputs_stats(std::vector<batch_of_bare_unspent_o
{
if (tids_grouped_by_txs.back().tids.size() >= 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::vector<batch_of_bare_unspent_o
WLT_THROW_IF_FALSE_WALLET_INT_ERR_EX(jt->first >= 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;

2
src/wallet/wallet2.h
View file

@ -346,7 +346,7 @@ namespace tools
struct batch_of_bare_unspent_outs
{
std::vector<size_t> tids;
std::vector<uint64_t> tids;
uint64_t total_amount = 0;
bool additional_tid = false; // additional zc transfer if total_amount < min fee
uint64_t additional_tid_amount = 0;

12
src/wallet/wallets_manager.h
View file

@ -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<tools::wallet_public::asset_balance_entry>& 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<tools::wallet_public::asset_balance_entry>& 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<tools::wallet_public::wallet_entry_info>& wallets) override;
virtual bool on_mw_select_wallet(uint64_t wallet_id) override;