Add all function wallet.

Markuu-s · Markuu-s · commit 37c750cf7931 · 2022-02-21T15:18:35.000+03:00
Signed-off-by: Markuu-s &lt;qwert11223381@gmail.com&gt;
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -113,6 +113,7 @@ include_directories(
     ${PROJECT_SOURCE_DIR}/libs
 )
 
+<<<<<<< Updated upstream
 if (BUILD_INTERNAL_DEPS)
   include_directories(
       SYSTEM
@@ -122,6 +123,16 @@ if (BUILD_INTERNAL_DEPS)
   )
 endif()
 
+=======
+include_directories(
+    SYSTEM
+    # system includes
+    deps/indicators/include
+    deps/libsecp256k1/include
+)
+
+add_subdirectory(core)
+>>>>>>> Stashed changes
 add_subdirectory(libs)
 add_subdirectory(core)
 
diff --git a/core/api/wallet/local_wallet.cpp b/core/api/wallet/local_wallet.cpp
@@ -65,6 +65,9 @@ namespace fc::api {
       }
       return std::move(address);
     }};
+    api->WalletList = [=]() -> outcome::result<std::vector<Address>> {
+
+    };
     api->WalletSetDefault = [=](auto &address) -> outcome::result<void> {
       wallet_default_address->setCbor(address);
       return outcome::success();
diff --git a/core/api/wallet/wallet_api.hpp b/core/api/wallet/wallet_api.hpp
@@ -51,6 +51,10 @@ namespace fc::api {
                const Address &,
                const Bytes &,
                const Signature &)
+
+    API_METHOD(WalletList, jwt::kAdminPermission, std::vector<Address>)
+
+    API_METHOD(WalletDelete, jwt::kAdminPermission, void, const Address &)
   };
 
   template <typename A, typename F>
@@ -63,6 +67,8 @@ namespace fc::api {
     f(a.WalletSetDefault);
     f(a.WalletSign);
     f(a.WalletVerify);
+    f(a.WalletList);
+    f(a.WalletDelete);
   }
 
 }  // namespace fc::api
diff --git a/core/cli/cli.hpp b/core/cli/cli.hpp
@@ -0,0 +1,196 @@
+/**
+ * Copyright Soramitsu Co., Ltd. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include <boost/optional.hpp>
+#include <boost/program_options/options_description.hpp>
+#include <map>
+#include <memory>
+#include <typeindex>
+
+#define CLI_TRY(valueName, maybeResult)                                        \
+  auto valueName##OUTCOME_TRY = maybeResult;                                   \
+  if (not valueName##OUTCOME_TRY.has_value()) throw std::invalid_argument(""); \
+  auto valueName = valueName##OUTCOME_TRY.value();
+
+#define CLI_TRY1(maybeResult)                \
+  auto valueName##OUTCOME_TRY = maybeResult; \
+  if (not valueName##OUTCOME_TRY.has_value()) throw std::invalid_argument("");
+
+#define CLI_TRY_TEXT(valueName, maybeResult, textError) \
+  auto valueName##OUTCOME_TRY = maybeResult;            \
+  if (not valueName##OUTCOME_TRY.has_value())           \
+    throw std::invalid_argument(textError);             \
+  auto valueName = valueName##OUTCOME_TRY.value();
+
+#define CLI_TRY_TEXT1(maybeResult, textError) \
+  auto valueName##OUTCOME_TRY = maybeResult;  \
+  if (not valueName##OUTCOME_TRY.has_value()) \
+    throw std::invalid_argument(textError);
+
+#define CLI_OPTS() ::fc::cli::Opts opts()
+#define CLI_RUN()                                                 \
+  static ::fc::cli::RunResult run(const ::fc::cli::ArgsMap &argm, \
+                                  const Args &args,               \
+                                  const ::fc::cli::Argv &argv)
+#define CLI_NO_RUN() constexpr static nullptr_t run{nullptr};
+
+namespace fc::cli {
+  namespace po = boost::program_options;
+  using Opts = po::options_description;
+
+  using RunResult = void;
+  struct ArgsMap {
+    std::map<std::type_index, std::shared_ptr<void>> _;
+    template <typename Args>
+    void add(Args &&v) {
+      _.emplace(typeid(Args), std::make_shared<Args>(std::forward<Args>(v)));
+    }
+    template <typename Cmd>
+    const typename Cmd::Args &of() const {
+      return *reinterpret_cast<const typename Cmd::Args *>(
+          _.at(typeid(typename Cmd::Args)).get());
+    }
+  };
+  // note: Args is defined inside command
+  using Argv = std::vector<std::string>;
+
+  struct Empty {
+    struct Args {
+      CLI_OPTS() {
+        return {};
+      }
+    };
+    CLI_NO_RUN();
+  };
+  using Group = Empty;
+
+  struct ShowHelp {};
+
+  class TableWriter {
+    struct Column {
+      std::string name;
+      bool separate_line;
+      int lines = 0;
+    };
+    using Row = std::map<int, std::string>;
+
+    std::vector<Column> columns;
+    std::vector<Row> rows;
+
+   public:
+    static Column newColumn(const std::string &name) {
+      Column column{.name = name, .separate_line = false};
+      return column;
+    }
+
+    static Column newLineColumn(const std::string &name) {
+      Column column{.name = name, .separate_line = true};
+      return column;
+    }
+
+    explicit TableWriter(const std::vector<Column> &cols) {
+      columns = cols;
+    }
+
+    void write(std::map<std::string, std::string> range) {
+      std::map<int, std::string> byColumnId;
+      bool flag = false;
+
+      while (not flag) {
+        for (auto &[columnName, value] : range) {
+          for (size_t i = 0; i < columns.size(); ++i) {
+            Column &column = columns[i];
+            if (column.name == columnName) {
+              byColumnId[i] = std::move(value);
+              range.erase(columnName);
+              column.lines++;
+              flag = true;
+              break;
+            }
+          }
+
+          if (flag) {
+            break;
+          }
+          byColumnId[columns.size()] = std::move(value);
+          range.erase(columnName);
+          columns.push_back(
+              Column{.name = columnName, .separate_line = false, .lines = 1});
+        }
+        flag = not flag;
+      }
+
+      rows.push_back(byColumnId);
+    }
+
+    void flush() {
+      std::vector<int> colLenghts;
+      colLenghts.reserve(columns.size());
+
+      std::map<int, std::string> header;
+      for (size_t i = 0; i < columns.size(); ++i) {
+        Column &column = columns[i];
+        if (column.separate_line) {
+          continue;
+        }
+        header[i] = column.name;
+      }
+
+      rows.insert(rows.begin(), header);
+
+      for (size_t i = 0; i < columns.size(); ++i) {
+        Column &column = columns[i];
+        if (column.lines == 0) {
+          continue;
+        }
+
+        for (size_t j = 0; j < rows.size(); ++j) {
+          Row &row = rows[j];
+          if (row.find(i) == row.end()) {
+            continue;
+          }
+          std::string value = row[i];
+          if (value.size() > colLenghts[i]) {
+            colLenghts[i] = value.size();
+          }
+        }
+      }
+
+      for (Row &row : rows) {
+        std::vector<std::string> cols;
+        cols.reserve(cols.size());
+
+        for (int i = 0; i < columns.size(); ++i) {
+          Column &column = columns[i];
+          if (column.lines == 0) {
+            continue;
+          }
+
+          std::string e = row[i];
+          int pad = colLenghts[i] - e.size() + 2;
+          if (not column.separate_line && column.lines > 0) {
+            e += std::string(pad, ' ');
+            std::cout << e;
+          }
+
+          cols.push_back(e);
+        }
+
+        std::cout << '\n';
+
+        for (int i = 0; i < columns.size(); ++i) {
+          Column &column = columns[i];
+          if (not column.separate_line || cols[i].size() == 0) {
+            continue;
+          }
+
+          std::cout << "  " << column.name << ": " << cols[i] << '\n';
+        }
+      }
+    }
+  };
+}  // namespace fc::cli
diff --git a/core/cli/node/_tree.hpp b/core/cli/node/_tree.hpp
@@ -0,0 +1,41 @@
+/**
+ * Copyright Soramitsu Co., Ltd. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include "cli/node/client.hpp"
+#include "cli/node/net.hpp"
+#include "cli/node/wallet.hpp"
+#include "cli/tree.hpp"
+
+namespace fc::cli::_node {
+  const auto _tree{tree<Node>(
+      {{"net",
+        tree<Group>({
+            {"listen", tree<Node_net_listen>()},
+        })},
+       {"client",
+        tree<Group>({
+            {"retrieve", tree<clientRetrive>()},
+        })},
+       {"wallet",
+        tree<Group>({
+            {"new", tree<walletNew>()},                 // TODO DONE)))
+            {"list", tree<walletList>()},               // TODO DONE)))
+            {"balance", tree<walletBalance>()},         // TODO DONE)))
+            {"default", tree<walletDefault>()},         // TODO DONE)))
+            {"set-default", tree<walletSetDefault>()},  // TODO DONE)))
+            {"import", tree<walletImport>()},           // TODO 20% StateGetActor
+            {"sign", tree<walletSign>()},               // TODO DONE)))
+            {"verify", tree<walletVerify>()},           // TODO DONE)))
+            {"delete",
+             tree<walletDelete>()},  // TODO DONE))) (p.S api._->WalletDelete add)
+            {"market",
+             tree<Group>({
+                 {"withdraw", tree<walletWithdraw>()},  // TODO 99% (p.S api._->MarketGetReserved add, api._->MarketWithdraw)
+                 {"add", tree<walletAdd>()},            // TODO DONE))) (p.S api._->MarketAddBalance add)
+             })},
+        })}})};
+}  // namespace fc::cli::_node
diff --git a/core/cli/node/client.hpp b/core/cli/node/client.hpp
@@ -0,0 +1,37 @@
+//
+// Created by Ruslan Gilvanov  on 12.02.2022.
+
+#pragma once
+#include "cli/node/node.hpp"
+
+namespace fc::cli::_node {
+
+  struct clientRetrive {
+    struct Args {
+      bool car{};
+      bool export_merkle_root{};
+      std::string data_selector;
+
+      CLI_OPTS() {
+        Opts opts;
+        auto option{opts.add_options()};
+        option("car",
+               po::bool_switch(&car),
+               "Export to a car file instead of a regular file");
+        option("data-selector",
+               po::value(&data_selector),
+               "IPLD datamodel text-path selector, or IPLD json selector");
+        option("car-export-merkle-proof",
+               po::bool_switch(&export_merkle_root),
+               "(requires --data-selector and --car) Export data-selector "
+               "merkle proof");
+        return opts;
+      }
+    };
+
+    CLI_RUN() {
+      std::cout << args.data_selector << "\n";
+    }
+  };
+
+}  // namespace fc::cli::_node
diff --git a/core/cli/node/wallet.hpp b/core/cli/node/wallet.hpp
diff --git a/libs/cpp-ledger/ledger/CMakeLists.txt b/libs/cpp-ledger/ledger/CMakeLists.txt
