wallet2 public api. initial commit

src/wallet/CMakeLists.txt

@@ -26,9 +26,13 @@
 # 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.
 
+
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+
 set(wallet_sources
   wallet2.cpp
-  wallet_rpc_server.cpp)
+  wallet_rpc_server.cpp
+  wallet2_api.cpp)
 
 set(wallet_headers)
 
@@ -37,7 +41,8 @@ set(wallet_private_headers
   wallet_errors.h
   wallet_rpc_server.h
   wallet_rpc_server_commands_defs.h
-  wallet_rpc_server_error_codes.h)
+  wallet_rpc_server_error_codes.h
+  wallet2_api.h)
 
 bitmonero_private_headers(wallet
   ${wallet_private_headers})
@@ -54,3 +59,5 @@ target_link_libraries(wallet
     ${Boost_SYSTEM_LIBRARY}
     ${Boost_THREAD_LIBRARY}
     ${EXTRA_LIBRARIES})
+
+

src/wallet/wallet2_api.cpp

@@ -0,0 +1,145 @@
+// 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 "wallet2_api.h"
+#include "wallet2.h"
+#include <memory>
+
+namespace Bitmonero {
+
+struct WalletManagerImpl;
+
+namespace {
+    static WalletManagerImpl * g_walletManager = nullptr;
+}
+
+
+///////////////////////// Wallet implementation ////////////////////////////////
+class WalletImpl : public Wallet
+{
+public:
+    WalletImpl();
+    ~WalletImpl();
+    bool create(const std::string &path, const std::string &password,
+                const std::string &language);
+    bool open(const std::string &path, const std::string &password);
+
+    std::string seed() const;
+
+private:
+    std::unique_ptr<tools::wallet2> m_wallet;
+
+};
+
+
+WalletImpl::WalletImpl()
+{
+
+}
+
+
+WalletImpl::~WalletImpl()
+{
+    //delete m_wallet;
+}
+
+bool WalletImpl::create(const std::string &path, const std::string &password, const std::string &language)
+{
+    bool keys_file_exists;
+    bool wallet_file_exists;
+    tools::wallet2::wallet_exists(path, keys_file_exists, wallet_file_exists);
+    LOG_PRINT_L3("wallet_path: " << path << "");
+    LOG_PRINT_L3("keys_file_exists: " << std::boolalpha << keys_file_exists << std::noboolalpha
+                 << "  wallet_file_exists: " << std::boolalpha << wallet_file_exists << std::noboolalpha);
+
+
+    // add logic to error out if new wallet requested but named wallet file exists
+    if (keys_file_exists || wallet_file_exists) {
+
+        LOG_ERROR("attempting to generate or restore wallet, but specified file(s) exist.  Exiting to not risk overwriting.");
+        return false;
+
+    }
+
+    // TODO: validate language
+
+
+    // TODO: create wallet
+    m_wallet.reset(new tools::wallet2());
+    crypto::secret_key recovery_val, secret_key;
+    try {
+        recovery_val = m_wallet->generate(path, password, secret_key, false, false);
+    } catch (const std::exception& e) {
+        // TODO: log exception
+        return false;
+    }
+    return true;
+}
+
+
+
+///////////////////////// WalletManager implementation /////////////////////////
+class WalletManagerImpl : public WalletManager
+{
+public:
+    Wallet * createWallet(const std::string &path, const std::string &password,
+                          const std::string &language);
+
+private:
+    WalletManagerImpl() {}
+    friend struct WalletManagerFactory;
+};
+
+Wallet *WalletManager::createWallet(const std::string &path, const std::string &password,
+                                    const std::string &language)
+{
+    WalletImpl * wallet = new WalletImpl();
+    // TODO open wallet, set password, etc
+    if (!wallet->create(path, password, language)) {
+        delete wallet;
+        wallet = nullptr;
+    }
+
+    return wallet;
+}
+
+
+///////////////////// WalletManagerFactory implementation //////////////////////
+WalletManager *WalletManagerFactory::getWalletManager()
+{
+    if  (!g_walletManager) {
+        g_walletManager = new WalletManagerImpl();
+    }
+
+    return g_walletManager;
+}
+
+
+}

src/wallet/wallet2_api.h

@@ -0,0 +1,73 @@
+// 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
+
+#pragma once
+
+
+#include <string>
+
+//  Public interface for libwallet library
+namespace Bitmonero {
+
+
+/**
+ * @brief Interface for wallet operations.
+ *        TODO: check if /include/IWallet.h is still actual
+ */
+struct Wallet
+{
+   // TODO define wallet interface (decide what needed from wallet2)
+   virtual ~Wallet() = 0;
+   virtual std::string seed() const = 0;
+};
+
+/**
+ * @brief WalletManager - provides functions to manage wallets
+ */
+struct WalletManager
+{
+    //! creates new wallet
+    Wallet * createWallet(const std::string &path, const std::string &password, const std::string &language);
+    //! opens existing wallet
+    Wallet * openWallet(const std::string &path, const std::string &password);
+
+    bool walletExists(const std::string &path);
+
+    int lastError() const;
+};
+
+
+struct WalletManagerFactory
+{
+    static WalletManager * getWalletManager();
+};
+
+}
+