Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Wallet::createTransaction API introduced

This commit is contained in:
Ilya Kitaev 2016-04-05 15:24:44 +03:00
parent ee5bb17f26
commit 079fbd3d42
3 changed files with 204 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

178
src/wallet/wallet2_api.cpp
View File

@ -66,65 +66,43 @@ using namespace cryptonote;
Wallet::~Wallet() {}
Transaction::~Transaction() {}
class WalletImpl;
///////////////////////// Transaction implementation ///////////////////////////
class TransactionImpl : public Transaction
{
public:
TransactionImpl(Wallet * wallet);
TransactionImpl(WalletImpl * wallet);
~TransactionImpl();
int status() const;
std::string errorString() const;
bool commit();
private:
std::vector<tools::wallet2::pending_tx> & transactions();
uint64_t dust() const;
uint64_t fee() const;
// TODO: continue with interface;
private:
friend class WalletImpl;
Wallet * m_wallet;
WalletImpl * m_wallet;
int m_status;
std::string m_errorString;
std::vector<tools::wallet2::pending_tx> m_pending_tx;
};
TransactionImpl::TransactionImpl(Wallet *wallet)
: m_wallet(wallet)
/////////////////////////////////////////////////////////////////////////////////
string Wallet::displayAmount(uint64_t amount)
{
return cryptonote::print_money(amount);
}
TransactionImpl::~TransactionImpl()
{
}
int TransactionImpl::status() const
{
return m_status;
}
string TransactionImpl::errorString() const
{
return m_errorString;
}
bool TransactionImpl::commit()
{
// while (!m_pending_tx.empty()) {
// }
return false;
}
///////////////////////// Wallet implementation ////////////////////////////////
@ -151,16 +129,15 @@ public:
bool connectToDaemon();
uint64_t balance() const;
uint64_t unlockedBalance() const;
std::string displayAmount(uint64_t amount) const;
bool refresh();
bool transfer(const std::string &dst_addr, uint64_t amount);
Transaction * createTransaction(const std::string &dst_addr, uint64_t amount);
virtual void disposeTransaction(Transaction * t);
private:
void clearStatus();
private:
//std::unique_ptr<tools::wallet2> m_wallet;
friend class TransactionImpl;
tools::wallet2 * m_wallet;
int m_status;
std::string m_errorString;
@ -366,10 +343,6 @@ uint64_t WalletImpl::unlockedBalance() const
return m_wallet->unlocked_balance();
}
std::string WalletImpl::displayAmount(uint64_t amount) const
{
return cryptonote::print_money(amount);
}
bool WalletImpl::refresh()
{
@ -383,7 +356,8 @@ bool WalletImpl::refresh()
return m_status == Status_Ok;
}
bool WalletImpl::transfer(const std::string &dst_addr, uint64_t amount)
Transaction *WalletImpl::createTransaction(const string &dst_addr, uint64_t amount)
{
clearStatus();
vector<cryptonote::tx_destination_entry> dsts;
@ -395,33 +369,33 @@ bool WalletImpl::transfer(const std::string &dst_addr, uint64_t amount)
if (fake_outs_count == 0)
fake_outs_count = DEFAULT_MIX;
TransactionImpl * transaction = new TransactionImpl(this);
do {
if(!cryptonote::get_account_integrated_address_from_str(de.addr, has_payment_id, new_payment_id, m_wallet->testnet(), dst_addr)) {
// TODO: copy-paste 'if treating as an address fails, try as url' from simplewallet.cpp:1982
m_status = Status_Error;
m_errorString = "Invalid destination address";
return false;
break;
}
de.amount = amount;
if (de.amount <= 0) {
m_status = Status_Error;
m_errorString = "Invalid amount";
return false;
break;
}
dsts.push_back(de);
std::vector<tools::wallet2::pending_tx> ptx_vector;
//std::vector<tools::wallet2::pending_tx> ptx_vector;
std::vector<uint8_t> extra;
try {
ptx_vector = m_wallet->create_transactions(dsts, fake_outs_count, 0 /* unlock_time */, 0 /* unused fee arg*/, extra);
// TODO: move it to transaction class
while (!ptx_vector.empty()) {
auto & ptx = ptx_vector.back();
m_wallet->commit_tx(ptx);
// success_msg_writer(true) << tr("Money successfully sent, transaction ") << get_transaction_hash(ptx.tx);
// if no exception, remove element from vector
ptx_vector.pop_back();
} // TODO: extract method;
transaction->m_pending_tx = m_wallet->create_transactions(dsts, fake_outs_count, 0 /* unlock_time */, 0 /* unused fee arg*/, extra);
// TODO: move it to transaction class
} catch (const tools::error::daemon_busy&) {
// TODO: make it translatable with "tr"?
m_errorString = tr("daemon is busy. Please try again later.");
@ -482,7 +456,16 @@ bool WalletImpl::transfer(const std::string &dst_addr, uint64_t amount)
m_errorString = tr("unknown error");
m_status = Status_Error;
}
return m_status == Status_Ok;
} while (false);
transaction->m_status = m_status;
transaction->m_errorString = m_errorString;
return transaction;
}
void WalletImpl::disposeTransaction(Transaction *t)
{
delete t;
}
bool WalletImpl::connectToDaemon()
@ -503,6 +486,81 @@ void WalletImpl::clearStatus()
TransactionImpl::TransactionImpl(WalletImpl *wallet)
: m_wallet(wallet)
{
}
TransactionImpl::~TransactionImpl()
{
}
int TransactionImpl::status() const
{
return m_status;
}
string TransactionImpl::errorString() const
{
return m_errorString;
}
bool TransactionImpl::commit()
{
try {
while (!m_pending_tx.empty()) {
auto & ptx = m_pending_tx.back();
m_wallet->m_wallet->commit_tx(ptx);
// success_msg_writer(true) << tr("Money successfully sent, transaction ") << get_transaction_hash(ptx.tx);
// if no exception, remove element from vector
m_pending_tx.pop_back();
} // TODO: extract method;
} catch (const tools::error::daemon_busy&) {
// TODO: make it translatable with "tr"?
m_errorString = tr("daemon is busy. Please try again later.");
m_status = Status_Error;
} catch (const tools::error::no_connection_to_daemon&) {
m_errorString = tr("no connection to daemon. Please make sure daemon is running.");
m_status = Status_Error;
} catch (const tools::error::tx_rejected& e) {
std::ostringstream writer(m_errorString);
writer << (boost::format(tr("transaction %s was rejected by daemon with status: ")) % get_transaction_hash(e.tx())) << e.status();
m_status = Status_Error;
} catch (std::exception &e) {
m_errorString = string(tr("Unknown exception: ")) + e.what();
m_status = Status_Error;
} catch (...) {
m_errorString = tr("Unhandled exception");
LOG_ERROR(m_errorString);
m_status = Status_Error;
}
return m_status == Status_Ok;
}
uint64_t TransactionImpl::dust() const
{
uint32_t result = 0;
for (auto ptx : m_pending_tx) {
result += ptx.dust;
}
return result;
}
uint64_t TransactionImpl::fee() const
{
uint32_t result = 0;
for (auto ptx : m_pending_tx) {
result += ptx.fee;
}
return result;
}
///////////////////////// WalletManager implementation /////////////////////////
class WalletManagerImpl : public WalletManager
{

11
src/wallet/wallet2_api.h
View File

@ -45,10 +45,12 @@ struct Transaction
Status_Ok,
Status_Error
};
virtual ~Transaction() = 0;
virtual int status() const = 0;
virtual std::string errorString() const = 0;
virtual bool commit() = 0;
virtual uint64_t dust() const = 0;
virtual uint64_t fee() const = 0;
};
/**
@ -85,13 +87,12 @@ struct Wallet
virtual bool connectToDaemon() = 0;
virtual uint64_t balance() const = 0;
virtual uint64_t unlockedBalance() const = 0;
virtual std::string displayAmount(uint64_t amount) const = 0;
static std::string displayAmount(uint64_t amount);
// TODO?
// virtual uint64_t unlockedDustBalance() const = 0;
virtual bool refresh() = 0;
// TODO transfer
virtual bool transfer(const std::string &dst_addr, uint64_t amount) = 0;
virtual Transaction * createTransaction(const std::string &dst_addr, uint64_t amount) = 0;
virtual void disposeTransaction(Transaction * t) = 0;
};
/**

10
tests/libwallet_api_tests/main.cpp
View File

@ -264,14 +264,20 @@ TEST_F(WalletManagerTest, WalletRefresh)
ASSERT_TRUE(wmgr->closeWallet(wallet1));
}
TEST_F(WalletManagerTest, WalletTransfer)
TEST_F(WalletManagerTest, WalletTransaction)
{
Bitmonero::Wallet * wallet1 = wmgr->openWallet(TESTNET_WALLET_NAME, TESTNET_WALLET_PASS, true);
// make sure testnet daemon is running
ASSERT_TRUE(wallet1->init(TESTNET_DAEMON_ADDRESS, 0));
ASSERT_TRUE(wallet1->refresh());
uint64_t balance = wallet1->balance();
ASSERT_TRUE(wallet1->transfer(RECIPIENT_WALLET_ADDRESS, AMOUNT_10XMR));
Bitmonero::Transaction * transaction = wallet1->createTransaction(
RECIPIENT_WALLET_ADDRESS, AMOUNT_10XMR);
ASSERT_TRUE(transaction->status() == Bitmonero::Transaction::Status_Ok);
ASSERT_TRUE(wallet1->balance() == balance);
ASSERT_TRUE(transaction->commit());
ASSERT_FALSE(wallet1->balance() == balance);
ASSERT_TRUE(wmgr->closeWallet(wallet1));
}