7 files changed, 110 insertions, 16 deletions
diff --git a/src/wallet/api/pending_transaction.cpp b/src/wallet/api/pending_transaction.cpp
index e9791ec35..db40851b4 100644
--- a/src/wallet/api/pending_transaction.cpp
+++ b/src/wallet/api/pending_transaction.cpp
@@ -48,28 +48,28 @@ namespace Bitmonero {
 PendingTransaction::~PendingTransaction() {}
 
 
-TransactionImpl::TransactionImpl(WalletImpl *wallet)
+PendingTransactionImpl::PendingTransactionImpl(WalletImpl *wallet)
     : m_wallet(wallet)
 {
 
 }
 
-TransactionImpl::~TransactionImpl()
+PendingTransactionImpl::~PendingTransactionImpl()
 {
 
 }
 
-int TransactionImpl::status() const
+int PendingTransactionImpl::status() const
 {
     return m_status;
 }
 
-string TransactionImpl::errorString() const
+string PendingTransactionImpl::errorString() const
 {
     return m_errorString;
 }
 
-bool TransactionImpl::commit()
+bool PendingTransactionImpl::commit()
 {
 
     LOG_PRINT_L0("m_pending_tx size: " << m_pending_tx.size());
@@ -105,7 +105,7 @@ bool TransactionImpl::commit()
     return m_status == Status_Ok;
 }
 
-uint64_t TransactionImpl::amount() const
+uint64_t PendingTransactionImpl::amount() const
 {
     uint64_t result = 0;
     for (const auto &ptx : m_pending_tx)   {
@@ -116,7 +116,7 @@ uint64_t TransactionImpl::amount() const
     return result;
 }
 
-uint64_t TransactionImpl::dust() const
+uint64_t PendingTransactionImpl::dust() const
 {
     uint32_t result = 0;
     for (const auto & ptx : m_pending_tx) {
@@ -125,7 +125,7 @@ uint64_t TransactionImpl::dust() const
     return result;
 }
 
-uint64_t TransactionImpl::fee() const
+uint64_t PendingTransactionImpl::fee() const
 {
     uint32_t result = 0;
     for (const auto ptx : m_pending_tx) {
diff --git a/src/wallet/api/transaction_history.cpp b/src/wallet/api/transaction_history.cpp
index f1aba14cb..3ebcc041e 100644
--- a/src/wallet/api/transaction_history.cpp
+++ b/src/wallet/api/transaction_history.cpp
@@ -28,6 +28,70 @@
 //
 // Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
 
+
 #include "transaction_history.h"
+#include "transaction_info.h"
+#include "wallet.h"
+
+#include "crypto/hash.h"
+#include "wallet/wallet2.h"
+#include "contrib/epee/include/string_tools.h"
+
+#include <string>
+#include <list>
+
+namespace Bitmonero {
+
+TransactionHistoryImpl::TransactionHistoryImpl(WalletImpl *wallet)
+{
+
+}
+
+TransactionHistoryImpl::~TransactionHistoryImpl()
+{
+
+}
+
+int TransactionHistoryImpl::count() const
+{
+    return 0;
+}
+
+TransactionInfo *TransactionHistoryImpl::transaction(const std::string &id) const
+{
+    return nullptr;
+}
+
+std::vector<TransactionInfo *> TransactionHistoryImpl::getAll() const
+{
+    return std::vector<TransactionInfo*>();
+}
+
+void TransactionHistoryImpl::refresh()
+{
+    // TODO: configurable values;
+    uint64_t min_height = 0;
+    uint64_t max_height = (uint64_t)-1;
+
+    // TODO: delete old transactions;
+
+    std::list<std::pair<crypto::hash, tools::wallet2::payment_details>> payments;
+    m_wallet->m_wallet->get_payments(payments, min_height, max_height);
+    for (std::list<std::pair<crypto::hash, tools::wallet2::payment_details>>::const_iterator i = payments.begin(); i != payments.end(); ++i) {
+        const tools::wallet2::payment_details &pd = i->second;
+        std::string payment_id = string_tools::pod_to_hex(i->first);
+        if (payment_id.substr(16).find_first_not_of('0') == std::string::npos)
+            payment_id = payment_id.substr(0,16);
+        // TODO
+        TransactionInfo * ti = new TransactionInfo();
+
+        //output.insert(std::make_pair(pd.m_block_height, std::make_pair(true, (boost::format("%20.20s %s %s %s") % print_money(pd.m_amount) % string_tools::pod_to_hex(pd.m_tx_hash) % payment_id % "-").str())));
+    }
+}
 
+TransactionInfo *TransactionHistoryImpl::transaction(int index) const
+{
+    return nullptr;
+}
 
+}
diff --git a/src/wallet/api/transaction_history.h b/src/wallet/api/transaction_history.h
index cab0e0dbc..1ff729b54 100644
--- a/src/wallet/api/transaction_history.h
+++ b/src/wallet/api/transaction_history.h
@@ -32,12 +32,23 @@
 
 namespace Bitmonero {
 
+class TransactionInfo;
+class WalletImpl;
+
 class TransactionHistoryImpl : public TransactionHistory
 {
+public:
+    TransactionHistoryImpl(WalletImpl * wallet);
+    ~TransactionHistoryImpl();
     virtual int count() const;
-    virtual TransactionInfo * transaction(int index)  const = 0;
-    virtual TransactionInfo * transaction(const std::string &id) const = 0;
-    virtual std::vector<TransactionInfo*> getAll() const = 0;
+    virtual TransactionInfo * transaction(int index)  const;
+    virtual TransactionInfo * transaction(const std::string &id) const;
+    virtual std::vector<TransactionInfo*> getAll() const;
+    virtual void refresh();
+
+private:
+    std::vector<TransactionInfo*> m_history;
+    WalletImpl *m_wallet;
 };
 
 }
diff --git a/src/wallet/api/transaction_info.h b/src/wallet/api/transaction_info.h
index 2ed8157f7..3aae19a64 100644
--- a/src/wallet/api/transaction_info.h
+++ b/src/wallet/api/transaction_info.h
@@ -34,6 +34,8 @@
 
 namespace Bitmonero {
 
+class TransactionHistoryImpl;
+
 class TransactionInfoImpl : public TransactionInfo
 {
 public:
@@ -47,6 +49,21 @@ public:
     virtual std::string address() const;
     virtual std::time_t timestamp() const;
     virtual std::string paymentId() const;
+
+private:
+    int         m_direction;
+    bool        m_hold;
+    bool        m_failed;
+    uint64_t    m_amount;
+    uint64_t    m_fee;
+    uint64_t    b_blockheight;
+    std::string m_address;
+    std::time_t m_timestamp;
+    std::string m_paymentid;
+
+
+    friend class TransactionHistoryImpl;
+
 };
 
 } // namespace
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
index e42f04cf7..a665fff95 100644
--- a/src/wallet/api/wallet.cpp
+++ b/src/wallet/api/wallet.cpp
@@ -288,7 +288,7 @@ PendingTransaction *WalletImpl::createTransaction(const string &dst_addr, uint64
     if (fake_outs_count == 0)
         fake_outs_count = DEFAULT_MIX;
 
-    TransactionImpl * transaction = new TransactionImpl(this);
+    PendingTransactionImpl * transaction = new PendingTransactionImpl(this);
 
     do {
 
diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h
index 35db38f67..6a654b13e 100644
--- a/src/wallet/api/wallet.h
+++ b/src/wallet/api/wallet.h
@@ -38,7 +38,8 @@
 
 
 namespace Bitmonero {
-
+class TransactionHistoryImpl;
+class PendingTransactionImpl;
 
 class WalletImpl : public Wallet
 {
@@ -72,7 +73,9 @@ private:
     void clearStatus();
 
 private:
-    friend class TransactionImpl;
+    friend class PendingTransactionImpl;
+    friend class TransactionHistoryImpl;
+
     tools::wallet2 * m_wallet;
     int  m_status;
     std::string m_errorString;
diff --git a/src/wallet/wallet2_api.h b/src/wallet/wallet2_api.h
index cb0211c4a..37d9ee86b 100644
--- a/src/wallet/wallet2_api.h
+++ b/src/wallet/wallet2_api.h
@@ -63,8 +63,7 @@ struct TransactionHistory
     virtual TransactionInfo * transaction(int index)  const = 0;
     virtual TransactionInfo * transaction(const std::string &id) const = 0;
     virtual std::vector<TransactionInfo*> getAll() const = 0;
-    // TODO:
-    // refresh();
+    virtual void refresh() = 0;
 };