aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/wallet/api')
-rw-r--r--src/wallet/api/address_book.cpp128
-rw-r--r--src/wallet/api/address_book.h67
-rw-r--r--src/wallet/api/wallet.cpp13
-rw-r--r--src/wallet/api/wallet.h5
-rw-r--r--src/wallet/api/wallet_manager.cpp2
5 files changed, 211 insertions, 4 deletions
diff --git a/src/wallet/api/address_book.cpp b/src/wallet/api/address_book.cpp
new file mode 100644
index 000000000..198ce17cd
--- /dev/null
+++ b/src/wallet/api/address_book.cpp
@@ -0,0 +1,128 @@
+// Copyright (c) 2014-2016, The Monero Project
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of
+// conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list
+// of conditions and the following disclaimer in the documentation and/or other
+// materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be
+// used to endorse or promote products derived from this software without specific
+// prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
+
+
+#include "address_book.h"
+#include "wallet.h"
+#include "crypto/hash.h"
+#include "wallet/wallet2.h"
+
+#include <vector>
+
+namespace Bitmonero {
+
+AddressBook::~AddressBook() {}
+
+AddressBookImpl::AddressBookImpl(WalletImpl *wallet)
+ : m_wallet(wallet) {}
+
+bool AddressBookImpl::addRow(const std::string &dst_addr , const std::string &payment_id, const std::string &description)
+{
+ LOG_PRINT_L2("Adding row");
+
+ clearStatus();
+
+ cryptonote::account_public_address addr;
+ bool has_payment_id;
+ crypto::hash8 payment_id_short;
+ if(!cryptonote::get_account_integrated_address_from_str(addr, has_payment_id, payment_id_short, m_wallet->m_wallet->testnet(), dst_addr)) {
+ m_errorString = "Invalid destination address";
+ m_errorCode = Invalid_Address;
+ return false;
+ }
+
+ crypto::hash pid32 = cryptonote::null_hash;
+ bool long_pid = (payment_id.empty())? false : tools::wallet2::parse_long_payment_id(payment_id, pid32);
+ if(!payment_id.empty() && !long_pid) {
+ m_errorString = "Invalid payment ID";
+ m_errorCode = Invalid_Payment_Id;
+ return false;
+ }
+
+ bool r = m_wallet->m_wallet->add_address_book_row(addr,pid32,description);
+ if (r)
+ refresh();
+ else
+ m_errorCode = General_Error;
+ return r;
+}
+
+void AddressBookImpl::refresh()
+{
+ LOG_PRINT_L2("Refreshing addressbook");
+
+ clearRows();
+
+ // Fetch from Wallet2 and create vector
+ for (auto const &a : m_wallet->m_wallet->get_address_book() ) {
+ auto row = a.second;
+ int rowId = a.first;
+
+ std::string payment_id = (row.m_payment_id == cryptonote::null_hash)? "" : epee::string_tools::pod_to_hex(row.m_payment_id);
+ std::string address = cryptonote::get_account_address_as_str(m_wallet->m_wallet->testnet(),row.m_address);
+
+ AddressBookRow * abr = new AddressBookRow(rowId, address, payment_id, row.m_description);
+ m_rows.push_back(abr);
+ }
+
+}
+
+bool AddressBookImpl::deleteRow(int rowId)
+{
+ LOG_PRINT_L2("Deleting address book row " << rowId);
+ bool r = m_wallet->m_wallet->delete_address_book_row(rowId);
+ refresh();
+ return r;
+}
+
+void AddressBookImpl::clearRows() {
+ for (auto r : m_rows) {
+ delete r;
+ }
+ m_rows.clear();
+}
+
+void AddressBookImpl::clearStatus(){
+ m_errorString = "";
+ m_errorCode = 0;
+}
+
+std::vector<AddressBookRow*> AddressBookImpl::getAll() const
+{
+ return m_rows;
+}
+
+
+AddressBookImpl::~AddressBookImpl()
+{
+ clearRows();
+}
+
+} // namespace \ No newline at end of file
diff --git a/src/wallet/api/address_book.h b/src/wallet/api/address_book.h
new file mode 100644
index 000000000..470dfdcfb
--- /dev/null
+++ b/src/wallet/api/address_book.h
@@ -0,0 +1,67 @@
+// Copyright (c) 2014-2016, The Monero Project
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of
+// conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list
+// of conditions and the following disclaimer in the documentation and/or other
+// materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be
+// used to endorse or promote products derived from this software without specific
+// prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
+
+#include "wallet/wallet2_api.h"
+#include "wallet/wallet2.h"
+
+namespace Bitmonero {
+
+class AddressBookRow;
+class WalletImpl;
+
+class AddressBookImpl : public AddressBook
+{
+public:
+ AddressBookImpl(WalletImpl * wallet);
+ ~AddressBookImpl();
+
+ // Fetches addresses from Wallet2
+ void refresh();
+ std::vector<AddressBookRow*> getAll() const;
+ bool addRow(const std::string &dst_addr , const std::string &payment_id, const std::string &description);
+ bool deleteRow(int rowId);
+
+ // Error codes. See AddressBook:ErrorCode enum in wallet2_api.h
+ std::string errorString() const {return m_errorString;}
+ int errorCode() const {return m_errorCode;}
+
+private:
+ void clearRows();
+ void clearStatus();
+
+private:
+ WalletImpl *m_wallet;
+ std::vector<AddressBookRow*> m_rows;
+ std::string m_errorString;
+ int m_errorCode;
+};
+
+}
+
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
index a772498cd..0a2f0f680 100644
--- a/src/wallet/api/wallet.cpp
+++ b/src/wallet/api/wallet.cpp
@@ -32,11 +32,13 @@
#include "wallet.h"
#include "pending_transaction.h"
#include "transaction_history.h"
+#include "address_book.h"
#include "common_defines.h"
#include "mnemonics/electrum-words.h"
#include <boost/format.hpp>
#include <sstream>
+#include <unordered_map>
using namespace std;
using namespace cryptonote;
@@ -209,6 +211,7 @@ WalletImpl::WalletImpl(bool testnet)
m_wallet->callback(m_wallet2Callback);
m_refreshThreadDone = false;
m_refreshEnabled = false;
+ m_addressBook = new AddressBookImpl(this);
m_refreshIntervalMillis = DEFAULT_REFRESH_INTERVAL_MILLIS;
@@ -223,6 +226,7 @@ WalletImpl::~WalletImpl()
{
stopRefresh();
delete m_history;
+ delete m_addressBook;
delete m_wallet;
delete m_wallet2Callback;
}
@@ -327,9 +331,7 @@ bool WalletImpl::close()
bool result = false;
LOG_PRINT_L3("closing wallet...");
try {
- // do not store wallet with invalid status
- if (status() == Status_Ok)
- m_wallet->store();
+ m_wallet->store();
LOG_PRINT_L3("wallet::store done");
LOG_PRINT_L3("Calling wallet::stop...");
m_wallet->stop();
@@ -823,6 +825,11 @@ TransactionHistory *WalletImpl::history() const
return m_history;
}
+AddressBook *WalletImpl::addressBook() const
+{
+ return m_addressBook;
+}
+
void WalletImpl::setListener(WalletListener *l)
{
// TODO thread synchronization;
diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h
index 5e4a64ff8..6fbb0da90 100644
--- a/src/wallet/api/wallet.h
+++ b/src/wallet/api/wallet.h
@@ -43,6 +43,7 @@
namespace Bitmonero {
class TransactionHistoryImpl;
class PendingTransactionImpl;
+class AddressBookImpl;
struct Wallet2CallbackImpl;
class WalletImpl : public Wallet
@@ -97,13 +98,13 @@ public:
virtual void disposeTransaction(PendingTransaction * t);
virtual TransactionHistory * history() const;
+ virtual AddressBook * addressBook() const;
virtual void setListener(WalletListener * l);
virtual uint32_t defaultMixin() const;
virtual void setDefaultMixin(uint32_t arg);
virtual bool setUserNote(const std::string &txid, const std::string &note);
virtual std::string getUserNote(const std::string &txid) const;
virtual std::string getTxKey(const std::string &txid) const;
-
virtual std::string signMessage(const std::string &message);
virtual bool verifySignedMessage(const std::string &message, const std::string &address, const std::string &signature) const;
@@ -121,6 +122,7 @@ private:
friend class PendingTransactionImpl;
friend class TransactionHistoryImpl;
friend class Wallet2CallbackImpl;
+ friend class AddressBookImpl;
tools::wallet2 * m_wallet;
mutable std::atomic<int> m_status;
@@ -130,6 +132,7 @@ private:
bool m_trustedDaemon;
WalletListener * m_walletListener;
Wallet2CallbackImpl * m_wallet2Callback;
+ AddressBookImpl * m_addressBook;
// multi-threaded refresh stuff
std::atomic<bool> m_refreshEnabled;
diff --git a/src/wallet/api/wallet_manager.cpp b/src/wallet/api/wallet_manager.cpp
index 25b081921..40afc87e9 100644
--- a/src/wallet/api/wallet_manager.cpp
+++ b/src/wallet/api/wallet_manager.cpp
@@ -56,6 +56,8 @@ Wallet *WalletManagerImpl::openWallet(const std::string &path, const std::string
{
WalletImpl * wallet = new WalletImpl(testnet);
wallet->open(path, password);
+ //Refresh addressBook
+ wallet->addressBook()->refresh();
return wallet;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 02:22:07 +0000