transaction history api in progress
This commit is contained in:
parent
f83f3cbd96
commit
b6aaf53a60
6 changed files with 68 additions and 16 deletions
|
@ -48,28 +48,28 @@ namespace Bitmonero {
|
||||||
PendingTransaction::~PendingTransaction() {}
|
PendingTransaction::~PendingTransaction() {}
|
||||||
|
|
||||||
|
|
||||||
TransactionImpl::TransactionImpl(WalletImpl *wallet)
|
PendingTransactionImpl::PendingTransactionImpl(WalletImpl *wallet)
|
||||||
: m_wallet(wallet)
|
: m_wallet(wallet)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
TransactionImpl::~TransactionImpl()
|
PendingTransactionImpl::~PendingTransactionImpl()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int TransactionImpl::status() const
|
int PendingTransactionImpl::status() const
|
||||||
{
|
{
|
||||||
return m_status;
|
return m_status;
|
||||||
}
|
}
|
||||||
|
|
||||||
string TransactionImpl::errorString() const
|
string PendingTransactionImpl::errorString() const
|
||||||
{
|
{
|
||||||
return m_errorString;
|
return m_errorString;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool TransactionImpl::commit()
|
bool PendingTransactionImpl::commit()
|
||||||
{
|
{
|
||||||
|
|
||||||
LOG_PRINT_L0("m_pending_tx size: " << m_pending_tx.size());
|
LOG_PRINT_L0("m_pending_tx size: " << m_pending_tx.size());
|
||||||
|
@ -105,7 +105,7 @@ bool TransactionImpl::commit()
|
||||||
return m_status == Status_Ok;
|
return m_status == Status_Ok;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t TransactionImpl::amount() const
|
uint64_t PendingTransactionImpl::amount() const
|
||||||
{
|
{
|
||||||
uint64_t result = 0;
|
uint64_t result = 0;
|
||||||
for (const auto &ptx : m_pending_tx) {
|
for (const auto &ptx : m_pending_tx) {
|
||||||
|
@ -116,7 +116,7 @@ uint64_t TransactionImpl::amount() const
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t TransactionImpl::dust() const
|
uint64_t PendingTransactionImpl::dust() const
|
||||||
{
|
{
|
||||||
uint32_t result = 0;
|
uint32_t result = 0;
|
||||||
for (const auto & ptx : m_pending_tx) {
|
for (const auto & ptx : m_pending_tx) {
|
||||||
|
@ -125,7 +125,7 @@ uint64_t TransactionImpl::dust() const
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t TransactionImpl::fee() const
|
uint64_t PendingTransactionImpl::fee() const
|
||||||
{
|
{
|
||||||
uint32_t result = 0;
|
uint32_t result = 0;
|
||||||
for (const auto ptx : m_pending_tx) {
|
for (const auto ptx : m_pending_tx) {
|
||||||
|
|
|
@ -30,4 +30,43 @@
|
||||||
|
|
||||||
#include "transaction_history.h"
|
#include "transaction_history.h"
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
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()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
TransactionInfo *TransactionHistoryImpl::transaction(int index) const
|
||||||
|
{
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
|
@ -32,12 +32,23 @@
|
||||||
|
|
||||||
namespace Bitmonero {
|
namespace Bitmonero {
|
||||||
|
|
||||||
|
class TransactionInfo;
|
||||||
|
class WalletImpl;
|
||||||
|
|
||||||
class TransactionHistoryImpl : public TransactionHistory
|
class TransactionHistoryImpl : public TransactionHistory
|
||||||
{
|
{
|
||||||
|
public:
|
||||||
|
TransactionHistoryImpl(WalletImpl * wallet);
|
||||||
|
~TransactionHistoryImpl();
|
||||||
virtual int count() const;
|
virtual int count() const;
|
||||||
virtual TransactionInfo * transaction(int index) const = 0;
|
virtual TransactionInfo * transaction(int index) const;
|
||||||
virtual TransactionInfo * transaction(const std::string &id) const = 0;
|
virtual TransactionInfo * transaction(const std::string &id) const;
|
||||||
virtual std::vector<TransactionInfo*> getAll() const = 0;
|
virtual std::vector<TransactionInfo*> getAll() const;
|
||||||
|
virtual void refresh();
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::vector<TransactionInfo*> m_history;
|
||||||
|
WalletImpl *m_wallet;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -288,7 +288,7 @@ PendingTransaction *WalletImpl::createTransaction(const string &dst_addr, uint64
|
||||||
if (fake_outs_count == 0)
|
if (fake_outs_count == 0)
|
||||||
fake_outs_count = DEFAULT_MIX;
|
fake_outs_count = DEFAULT_MIX;
|
||||||
|
|
||||||
TransactionImpl * transaction = new TransactionImpl(this);
|
PendingTransactionImpl * transaction = new PendingTransactionImpl(this);
|
||||||
|
|
||||||
do {
|
do {
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,8 @@
|
||||||
|
|
||||||
|
|
||||||
namespace Bitmonero {
|
namespace Bitmonero {
|
||||||
|
class TransactionHistoryImpl;
|
||||||
|
class PendingTransactionImpl;
|
||||||
|
|
||||||
class WalletImpl : public Wallet
|
class WalletImpl : public Wallet
|
||||||
{
|
{
|
||||||
|
@ -72,7 +73,9 @@ private:
|
||||||
void clearStatus();
|
void clearStatus();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
friend class TransactionImpl;
|
friend class PendingTransactionImpl;
|
||||||
|
friend class TransactionHistoryImpl;
|
||||||
|
|
||||||
tools::wallet2 * m_wallet;
|
tools::wallet2 * m_wallet;
|
||||||
int m_status;
|
int m_status;
|
||||||
std::string m_errorString;
|
std::string m_errorString;
|
||||||
|
|
|
@ -63,8 +63,7 @@ struct TransactionHistory
|
||||||
virtual TransactionInfo * transaction(int index) const = 0;
|
virtual TransactionInfo * transaction(int index) const = 0;
|
||||||
virtual TransactionInfo * transaction(const std::string &id) const = 0;
|
virtual TransactionInfo * transaction(const std::string &id) const = 0;
|
||||||
virtual std::vector<TransactionInfo*> getAll() const = 0;
|
virtual std::vector<TransactionInfo*> getAll() const = 0;
|
||||||
// TODO:
|
virtual void refresh() = 0;
|
||||||
// refresh();
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue