diff options
author | Jaquee <jaquee.monero@gmail.com> | 2017-08-03 21:37:45 +0200 |
---|---|---|
committer | Jaquee <jaquee.monero@gmail.com> | 2017-08-03 21:37:45 +0200 |
commit | a839a6fa8a01ade5672d8205bc5a2632a9992fc2 (patch) | |
tree | f488b794b798502a4ffea9cbfd91d97d74089a81 /src/wallet/api | |
parent | Merge pull request #2159 (diff) | |
download | monero-a839a6fa8a01ade5672d8205bc5a2632a9992fc2.tar.xz |
Wallet API: add tx unlock time
Diffstat (limited to 'src/wallet/api')
-rw-r--r-- | src/wallet/api/transaction_history.cpp | 1 | ||||
-rw-r--r-- | src/wallet/api/transaction_info.cpp | 6 | ||||
-rw-r--r-- | src/wallet/api/transaction_info.h | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/src/wallet/api/transaction_history.cpp b/src/wallet/api/transaction_history.cpp index 85f2b05ce..23d3905b2 100644 --- a/src/wallet/api/transaction_history.cpp +++ b/src/wallet/api/transaction_history.cpp @@ -132,6 +132,7 @@ void TransactionHistoryImpl::refresh() ti->m_blockheight = pd.m_block_height; ti->m_timestamp = pd.m_timestamp; ti->m_confirmations = wallet_height - pd.m_block_height; + ti->m_unlock_time = pd.m_unlock_time; m_history.push_back(ti); /* output.insert(std::make_pair(pd.m_block_height, std::make_pair(true, (boost::format("%20.20s %s %s %s") diff --git a/src/wallet/api/transaction_info.cpp b/src/wallet/api/transaction_info.cpp index 79a8fe9b5..171272265 100644 --- a/src/wallet/api/transaction_info.cpp +++ b/src/wallet/api/transaction_info.cpp @@ -50,6 +50,7 @@ TransactionInfoImpl::TransactionInfoImpl() , m_blockheight(0) , m_timestamp(0) , m_confirmations(0) + , m_unlock_time(0) { } @@ -115,6 +116,11 @@ uint64_t TransactionInfoImpl::confirmations() const return m_confirmations; } +uint64_t TransactionInfoImpl::unlockTime() const +{ + return m_unlock_time; +} + } // namespace namespace Bitmonero = Monero; diff --git a/src/wallet/api/transaction_info.h b/src/wallet/api/transaction_info.h index 16fa5da7a..ee56b859f 100644 --- a/src/wallet/api/transaction_info.h +++ b/src/wallet/api/transaction_info.h @@ -56,6 +56,7 @@ public: virtual std::string paymentId() const; virtual const std::vector<Transfer> &transfers() const; virtual uint64_t confirmations() const; + virtual uint64_t unlockTime() const; private: int m_direction; @@ -69,6 +70,7 @@ private: std::string m_paymentid; std::vector<Transfer> m_transfers; uint64_t m_confirmations; + uint64_t m_unlock_time; friend class TransactionHistoryImpl; |