aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/api
diff options
context:
space:
mode:
authorIlya Kitaev <mbg033@gmail.com>2016-06-10 13:52:10 +0300
committerIlya Kitaev <mbg033@gmail.com>2016-06-10 13:52:10 +0300
commit3ac20a46b38f88757c57cbcf8581cade312b7936 (patch)
treea442c13e8f4de56556c522a235196f81e3271f5a /src/wallet/api
parentWallet::filename, Wallet::keysFilename, tests for move wallet (diff)
downloadmonero-3ac20a46b38f88757c57cbcf8581cade312b7936.tar.xz
wallet::default_mixin exposed to public interface as
Wallet::setDefaultMixin, Wallet::defaultMixin; wallet::create_transaction_2 used in Wallet::createTransaction
Diffstat (limited to 'src/wallet/api')
-rw-r--r--src/wallet/api/wallet.cpp11
-rw-r--r--src/wallet/api/wallet.h2
2 files changed, 12 insertions, 1 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
index 5b68387ea..f6d7a561e 100644
--- a/src/wallet/api/wallet.cpp
+++ b/src/wallet/api/wallet.cpp
@@ -400,7 +400,7 @@ PendingTransaction *WalletImpl::createTransaction(const string &dst_addr, uint64
try {
- transaction->m_pending_tx = m_wallet->create_transactions(dsts, fake_outs_count, 0 /* unlock_time */,
+ transaction->m_pending_tx = m_wallet->create_transactions_2(dsts, fake_outs_count, 0 /* unlock_time */,
0 /* unused fee arg*/, extra, m_trustedDaemon);
} catch (const tools::error::daemon_busy&) {
@@ -486,6 +486,15 @@ void WalletImpl::setListener(WalletListener *l)
m_wallet2Callback->setListener(l);
}
+uint32_t WalletImpl::defaultMixin() const
+{
+ return m_wallet->default_mixin();
+}
+
+void WalletImpl::setDefaultMixin(uint32_t arg)
+{
+ m_wallet->default_mixin(arg);
+}
bool WalletImpl::connectToDaemon()
diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h
index c402ef53c..6c8913c25 100644
--- a/src/wallet/api/wallet.h
+++ b/src/wallet/api/wallet.h
@@ -74,6 +74,8 @@ public:
virtual void disposeTransaction(PendingTransaction * t);
virtual TransactionHistory * history() const;
virtual void setListener(WalletListener * l);
+ virtual uint32_t defaultMixin() const;
+ virtual void setDefaultMixin(uint32_t arg);
private:
void clearStatus();