Banking features to concealwallet

CMakeLists.txt

@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.0)
 
 include(CheckCXXCompilerFlag)
 set(VERSION "6.6.3")
+
 set(VERSION_BUILD_NO "Ataegina")
 # Packaged from main commits
 set(COMMIT 1db6e66)

include/IWalletLegacy.h

@@ -98,6 +98,7 @@ class IWalletLegacyObserver {
   virtual void externalTransactionCreated(TransactionId transactionId) {}
   virtual void sendTransactionCompleted(TransactionId transactionId, std::error_code result) {}
   virtual void transactionUpdated(TransactionId transactionId) {}
+  virtual void depositUpdated(const DepositId& depositId) {}
   virtual void depositsUpdated(const std::vector<DepositId>& depositIds) {}
 };
 
@@ -152,8 +153,11 @@ class IWalletLegacy {
   virtual std::list<TransactionOutputInformation> selectFusionTransfersToSend(uint64_t threshold, size_t minInputCount, size_t maxInputCount) = 0;
   virtual TransactionId sendFusionTransaction(const std::list<TransactionOutputInformation>& fusionInputs, uint64_t fee, const std::string& extra = "", uint64_t mixIn = 0, uint64_t unlockTimestamp = 0) = 0;
   virtual TransactionId deposit(uint32_t term, uint64_t amount, uint64_t fee, uint64_t mixIn = 0) = 0;
+  virtual TransactionId withdrawDeposit(const DepositId& depositId, uint64_t fee) = 0;
   virtual TransactionId withdrawDeposits(const std::vector<DepositId>& depositIds, uint64_t fee) = 0;
   virtual std::error_code cancelTransaction(size_t transferId) = 0;
+  virtual Deposit get_deposit(DepositId depositId) = 0;
+
 
 };
 

src/Common/StringTools.cpp

@@ -339,5 +339,14 @@ std::string timeIntervalToString(uint64_t intervalInSeconds) {
     ".s" + std::to_string(seconds);
 }
 
+std::string makeCenteredString(size_t width, const std::string& text) {
+  if (text.size() >= width) {
+    return text;
+  }
+
+  size_t offset = (width - text.size() + 1) / 2;
+  return std::string(offset, ' ') + text + std::string(width - text.size() - offset, ' ');
+}
+
 
 }

src/Common/StringTools.h

@@ -106,4 +106,6 @@ bool parseIpAddressAndPort(uint32_t& ip, uint32_t& port, const std::string& addr
 
 std::string timeIntervalToString(uint64_t intervalInSeconds);
 
-}
+std::string makeCenteredString(size_t width, const std::string& text);
+
+}

src/SimpleWallet/DepositHelper.cpp

@@ -0,0 +1,119 @@
+#include <sstream>
+#include <string>
+
+#include "DepositHelper.h"
+
+#include "CryptoNoteConfig.h"
+
+#include "Common/StringTools.h"
+
+namespace cn
+{
+  uint32_t deposit_helper::deposit_term(cn::Deposit deposit)
+  {
+    return deposit.term;
+  }
+
+  std::string deposit_helper::deposit_amount(cn::Deposit deposit, const Currency& currency)
+  {
+    return currency.formatAmount(deposit.amount);
+  }
+
+  std::string deposit_helper::deposit_interest(cn::Deposit deposit, const Currency& currency)
+  {
+    return currency.formatAmount(deposit.interest);
+  }
+
+  std::string deposit_helper::deposit_status(cn::Deposit deposit)
+  {
+    std::string status_str = "";
+
+    if (deposit.locked)
+      status_str = "Locked";
+    else if (deposit.spendingTransactionId == cn::WALLET_LEGACY_INVALID_TRANSACTION_ID)
+      status_str = "Unlocked";
+    else
+      status_str = "Spent";
+
+    return status_str;
+  }
+
+  size_t deposit_helper::deposit_creating_tx_id(cn::Deposit deposit)
+  {
+    return deposit.creatingTransactionId;
+  }
+
+  size_t deposit_helper::deposit_spending_tx_id(cn::Deposit deposit)
+  {
+    return deposit.spendingTransactionId;
+  }
+
+  uint64_t deposit_helper::deposit_unlock_height(cn::Deposit deposit)
+  {
+    return deposit.unlockHeight;
+  }
+
+  uint64_t deposit_helper::deposit_height(cn::WalletLegacyTransaction txInfo)
+  {
+    return txInfo.blockHeight;
+  }
+
+  std::string deposit_helper::get_deposit_info(cn::Deposit deposit, cn::DepositId did, const Currency& currency, cn::WalletLegacyTransaction txInfo)
+  {
+    std::string unlock_str = "";
+    uint64_t actual_unlock_height = deposit_height(txInfo) + deposit_term(deposit);
+
+    bool bad_unlock = actual_unlock_height > cn::parameters::CRYPTONOTE_MAX_BLOCK_NUMBER;
+    if (bad_unlock)
+      unlock_str = "Please wait.";
+    else
+      unlock_str = std::to_string(actual_unlock_height);
+
+    bool bad_unlock2 = unlock_str == "0";
+    if (bad_unlock2)
+      unlock_str = "ERROR";
+
+    std::stringstream full_info;
+
+    full_info << std::left <<
+      std::setw(8)  << common::makeCenteredString(8, std::to_string(did)) << " | " <<
+      std::setw(20) << common::makeCenteredString(20, deposit_amount(deposit, currency)) << " | " <<
+      std::setw(20) << common::makeCenteredString(20, deposit_interest(deposit, currency)) << " | " <<
+      std::setw(16) << common::makeCenteredString(16, unlock_str) << " | " <<
+      std::setw(10) << common::makeCenteredString(10, deposit_status(deposit));
+
+    std::string as_str = full_info.str();
+
+    return as_str;
+  }
+
+  std::string deposit_helper::get_full_deposit_info(cn::Deposit deposit, cn::DepositId did, const Currency& currency, cn::WalletLegacyTransaction txInfo)
+  {
+    std::string unlock_str = "";
+    uint64_t actual_unlock_height = deposit_height(txInfo) + deposit_term(deposit);
+
+    bool bad_unlock = actual_unlock_height > cn::parameters::CRYPTONOTE_MAX_BLOCK_NUMBER;
+    if (bad_unlock)
+      unlock_str = "Please wait.";
+    else
+      unlock_str = std::to_string(actual_unlock_height);
+
+    bool bad_unlock2 = unlock_str == "0";
+    if (bad_unlock2)
+      unlock_str = "ERROR";
+
+    std::stringstream full_info;
+
+    full_info <<
+      "ID:            "  << std::to_string(did) << "\n" <<
+      "Amount:        " << deposit_amount(deposit, currency) << "\n" <<
+      "Interest:      " << deposit_interest(deposit, currency) << "\n" <<
+      "Height:        " << deposit_height(txInfo) << "\n" <<
+      "Unlock Height: " << unlock_str << "\n" <<
+      "Status:        " << deposit_status(deposit) << "\n";
+
+    std::string as_str = full_info.str();
+
+    return as_str;
+  }
+}

src/SimpleWallet/DepositHelper.h

@@ -0,0 +1,83 @@
+
+
+
+#include <string>
+
+#include "IWalletLegacy.h"
+
+#include "CryptoNoteCore/Currency.h"
+
+namespace cn
+{
+  class deposit_helper
+  {
+  public:
+    /**
+     * @param deposit - obtain information from deposit
+     * @return - returns deposit term, should be multiple of 21900
+    **/
+    uint32_t deposit_term(cn::Deposit deposit);
+
+    /**
+     * @param deposit - obtain information from deposit
+     * @param currency - format output amount
+     * @return - returns deposit amount as string
+    **/
+    std::string deposit_amount(cn::Deposit deposit, const Currency& currency);
+
+    /**
+     * @param deposit  - obtain information from deposit
+     * @param currency - format output amount
+     * @return - returns deposit interest based of amount and term as string
+    **/
+    std::string deposit_interest(cn::Deposit deposit, const Currency& currency);
+
+    /**
+     * @param deposit - obtain information from deposit
+     * @return - "Locked", "Unlocked" or "Spent" depending on state of deposit
+    **/
+    std::string deposit_status(cn::Deposit deposit);
+
+    /**
+     * @param deposit - obtain information from deposit
+     * @return - returns deposit creatingTransactionId 
+    **/
+    size_t deposit_creating_tx_id(cn::Deposit deposit);
+
+    /**
+     * @param deposit - obtain information from deposit
+     * @return - returns deposit spendingTransactionId
+    **/
+    size_t deposit_spending_tx_id(cn::Deposit deposit);
+
+    /**
+     * @param deposit - obtain information from deposit
+     * @return - returns unlock height from height deposited + term
+    **/
+    uint64_t deposit_unlock_height(cn::Deposit deposit);
+
+    /**
+     * @param txInfo - obtain height from transaction
+     * @return - returns deposit height
+    **/
+    uint64_t deposit_height(cn::WalletLegacyTransaction txInfo);
+
+    /**
+     * @param deposit - obtain information from deposit
+     * @param did - id to search deposit
+     * @param currency - used to supply amount and interest
+     * @param txInfo - obtain height from transaction
+     * @return - returns deposit info string in single row style
+    **/
+    std::string get_deposit_info(cn::Deposit deposit, cn::DepositId did, const Currency& currency, cn::WalletLegacyTransaction txInfo);
+
+    /**
+     * @param deposit - obtain information from deposit
+     * @param did - id to search deposit
+     * @param currency - used to supply amount and interest
+     * @param txInfo - obtain height from transaction
+     * @return - returns full deposit info string
+    **/
+    std::string get_full_deposit_info(cn::Deposit deposit, cn::DepositId did, const Currency& currency, cn::WalletLegacyTransaction txInfo);
+  };
+}