diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-01-31 15:19:40 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-01-31 15:19:40 +0200 |
| commit | ac961f66f69642563fe46c3be40efdad521c2c4e (patch) | |
| tree | c662b2241380a793c64c2f1254de14cdf34339c8 /src/wallet/wallet2.h | |
| parent | Merge pull request #629 (diff) | |
| parent | new flush_txpool command, and associated RPC call (diff) | |
| download | monero-ac961f66f69642563fe46c3be40efdad521c2c4e.tar.xz | |
Merge pull request #630
bf6d147 new flush_txpool command, and associated RPC call (moneromooo-monero)
6288295 rpc: add missing return on error when getting a tx (moneromooo-monero)
b7e37b7 simplewallet: show_transfers can now show just failed txes (moneromooo-monero)
b11539f wallet: detect and handle failed outgoing transfers (moneromooo-monero)
4b23714 tx_pool: serialize missing kept_by_block flag (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet2.h')
| -rw-r--r-- | src/wallet/wallet2.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index e29619444..6ecfdf026 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -119,6 +119,7 @@ namespace tools time_t m_sent_time; std::vector<cryptonote::tx_destination_entry> m_dests; crypto::hash m_payment_id; + enum { pending, pending_not_in_pool, failed } m_state; }; struct confirmed_transfer_details @@ -375,6 +376,7 @@ namespace tools void parse_block_round(const cryptonote::blobdata &blob, cryptonote::block &bl, crypto::hash &bl_id, bool &error) const; bool use_fork_rules(uint8_t version); uint64_t get_upper_tranaction_size_limit(); + void check_pending_txes(); cryptonote::account_base m_account; std::string m_daemon_address; @@ -412,7 +414,7 @@ namespace tools } BOOST_CLASS_VERSION(tools::wallet2, 10) BOOST_CLASS_VERSION(tools::wallet2::payment_details, 0) -BOOST_CLASS_VERSION(tools::wallet2::unconfirmed_transfer_details, 1) +BOOST_CLASS_VERSION(tools::wallet2::unconfirmed_transfer_details, 2) BOOST_CLASS_VERSION(tools::wallet2::confirmed_transfer_details, 1) namespace boost @@ -440,6 +442,9 @@ namespace boost return; a & x.m_dests; a & x.m_payment_id; + if (ver < 2) + return; + a & x.m_state; } template <class Archive> |