diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-15 14:55:12 -0500 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-15 14:55:12 -0500 |
| commit | f00797a1f2bcd77ea6ec80076c936ef70a939d50 (patch) | |
| tree | 2c1c4ef143f02d6212e912d89d3c466aa87c5983 /src/wallet/wallet2.h | |
| parent | Merge pull request #1571 (diff) | |
| parent | fix timeout in check_connection (diff) | |
| download | monero-f00797a1f2bcd77ea6ec80076c936ef70a939d50.tar.xz | |
Merge pull request #1573
dea53962 fix timeout in check_connection (Jaquee)
Diffstat (limited to 'src/wallet/wallet2.h')
| -rw-r--r-- | src/wallet/wallet2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index 7f25673d6..2c93b4d17 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -402,7 +402,7 @@ namespace tools std::vector<wallet2::pending_tx> create_transactions_all(const cryptonote::account_public_address &address, const size_t fake_outs_count, const uint64_t unlock_time, uint32_t priority, const std::vector<uint8_t> extra, bool trusted_daemon); std::vector<wallet2::pending_tx> create_transactions_from(const cryptonote::account_public_address &address, std::vector<size_t> unused_transfers_indices, std::vector<size_t> unused_dust_indices, const size_t fake_outs_count, const uint64_t unlock_time, uint32_t priority, const std::vector<uint8_t> extra, bool trusted_daemon); std::vector<pending_tx> create_unmixable_sweep_transactions(bool trusted_daemon); - bool check_connection(uint32_t *version = NULL); + bool check_connection(uint32_t *version = NULL, uint32_t timeout = 200000); void get_transfers(wallet2::transfer_container& incoming_transfers) const; void get_payments(const crypto::hash& payment_id, std::list<wallet2::payment_details>& payments, uint64_t min_height = 0) const; void get_payments(std::list<std::pair<crypto::hash,wallet2::payment_details>>& payments, uint64_t min_height, uint64_t max_height = (uint64_t)-1) const; |