client updates

Signed-off-by: elestrias <[email protected]>

Author: Elestrias

core/cli/node/client.hpp

@@ -6,17 +6,15 @@
 #include "storage/car/car.hpp"
 #include "storage/ipld/memory_indexed_car.hpp"
 #include "storage/unixfs/unixfs.hpp"
-#include "storage/ipld/memory_indexed_car.hpp"
 
 namespace fc::cli::_node {
   using api::FileRef;
   using api::ImportRes;
   using api::RetrievalOrder;
-  using primitives::address::Address;
-  using proofs::padPiece;
   using ::fc::storage::car::makeCar;
   using ::fc::storage::unixfs::wrapFile;
-
+  using primitives::address::Address;
+  using proofs::padPiece;
 
   struct clientRetrieve {
     struct Args {
@@ -56,7 +54,10 @@ namespace fc::cli::_node {
       RetrievalOrder order{};
       auto data_cid{cliArgv<CID>(argv, 0, "dataCid")};
       auto path{cliArgv<boost::filesystem::path>(argv, 1, "path")};
-      order.client =  (args.from ? *args.from : cliTry(api._->WalletDefaultAddress(), "Getting address of default wallet..."));
+      order.client =
+          (args.from ? *args.from
+                     : cliTry(api._->WalletDefaultAddress(),
+                              "Getting address of default wallet..."));
       order.miner = (args.provider ? *args.provider : Address{});
       if (args.max_price) {
         fmt::print("max price is {}fil ({}attofil)\n",
@@ -74,25 +75,27 @@ namespace fc::cli::_node {
 
   struct clientImportData {
     struct Args {
-      CLI_BOOL("car", "import from a car file instead of a regular file")car;
+      CLI_BOOL("car", "import from a car file instead of a regular file") car;
 
       CLI_OPTS() {
-       Opts opts;
-       car(opts);
-       return opts;
+        Opts opts;
+        car(opts);
+        return opts;
       }
     };
 
     CLI_RUN() {
       Node::Api api{argm};
       auto path{cliArgv<std::string>(argv, 0, "path to file to import")};
       FileRef file_ref{path, args.car};
-      auto result = cliTry(api._->ClientImport(file_ref), "Processing data import");
+      auto result =
+          cliTry(api._->ClientImport(file_ref), "Processing data import");
       fmt::print("File Root CID: " + result.root.toString().value());
       fmt::print("Data Import Success");
     }
   };
 
+<<<<<<< HEAD
 
 <<<<<<< HEAD
   struct clientGenerateCar{
@@ -107,13 +110,18 @@ namespace fc::cli::_node {
       }
 =======
   struct Node_client_generateCar: Empty{
+=======
+  struct Node_client_generateCar : Empty {
+>>>>>>> f1466404 (client updates)
     CLI_RUN() {
       auto path_to{cliArgv<boost::filesystem::path>(argv, 0, "input-path")};
       auto path_out{cliArgv<boost::filesystem::path>(argv, 1, "output-path")};
 >>>>>>> 172a64dc (client methods cli updates)
 
       auto tmp_path = path_to.string() + ".unixfs-tmp.car";
-      auto ipld = cliTry(MemoryIndexedCar::make(tmp_path, true), "Creting IPLD instance of {}", tmp_path);
+      auto ipld = cliTry(MemoryIndexedCar::make(tmp_path, true),
+                         "Creting IPLD instance of {}",
+                         tmp_path);
       std::ifstream file{path_to.string()};
       auto root = cliTry(wrapFile(*ipld, file));
       cliTry(::fc::storage::car::makeSelectiveCar(
@@ -123,34 +131,50 @@ namespace fc::cli::_node {
     }
   };
 
+<<<<<<< HEAD
   struct clientLocal: Empty{
     CLI_RUN(){
       Node::Api api {argm};
       CLI_TRY_TEXT(result, api._->ClientListImports(), "Fail of getting imports list");
       for(auto it = result.begin(); it != result.end(); it++){
+=======
+  struct Node_client_local : Empty {
+    CLI_RUN() {
+      Node::Api api{argm};
+      auto result = cliTry(api._->ClientListImports(), "Getting imports list");
+      for (auto it = result.begin(); it != result.end(); it++) {
+>>>>>>> f1466404 (client updates)
         fmt::print("Root CID: {} \n", it->root.toString().value());
         fmt::print("Source: {}\n", it->source);
         fmt::print("Path: {}\n", it->path);
       }
     }
   };
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   struct clientFind{
     struct Args{
 =======
   struct Node_client_find{
+=======
+  struct Node_client_find {};
+>>>>>>> f1466404 (client updates)
 
-  };
-
-  struct Node_client_listRetrieval{
+  struct Node_client_listRetrieval {
     struct Args {
+<<<<<<< HEAD
       CLI_BOOL("verbose", "print verbose deal details")verbose;
       CLI_BOOL("show-failed", "show failed/failing deals")failed_show;
       CLI_BOOL("completed", "show completed retrievals")completed_show;
 >>>>>>> 172a64dc (client methods cli updates)
+=======
+      CLI_BOOL("verbose", "print verbose deal details") verbose;
+      CLI_BOOL("show-failed", "show failed/failing deals") failed_show;
+      CLI_BOOL("completed", "show completed retrievals") completed_show;
+>>>>>>> f1466404 (client updates)
 
-      CLI_OPTS(){
+      CLI_OPTS() {
         Opts opts;
         verbose(opts);
         failed_show(opts);
@@ -159,24 +183,24 @@ namespace fc::cli::_node {
       }
     };
 
-    CLI_RUN(){
+    CLI_RUN() {
       Node::Api api{argm};
       bool failed_show = !args.failed_show;
-      //TODO: continue;
+      // TODO: continue;
       // chan = ()
       // if(flag){
       //   chan->read([](){
       //      print(api->stateRetrivalsDeals)
       //
       //  })
-        while(true){
-          sleep(10000000000);
-        }
+      while (true) {
+        sleep(10000000000);
+      }
       //
     }
-
   };
 
+<<<<<<< HEAD
 
 
 <<<<<<< HEAD
@@ -185,6 +209,9 @@ namespace fc::cli::_node {
 
 =======
   struct Node_client_inspectDeal{
+=======
+  struct Node_client_inspectDeal {
+>>>>>>> f1466404 (client updates)
     struct Args {
       CLI_OPTIONAL("proposal-cid", "proposal cid of deal to be inspected", CID)
       proposal_cid;
@@ -196,79 +223,117 @@ namespace fc::cli::_node {
         return opts;
       }
     };
-    CLI_RUN(){
+    CLI_RUN() {
       Node::Api api{argm};
-
-
-
     }
-
   };
-  struct Node_client_list_deals{
+  struct Node_client_list_deals {
     struct Args {
       CLI_BOOL("show-failed", "show failed/failing deals") failed_show;
-      CLI_OPTS(){
+      CLI_OPTS() {
         Opts opts;
         failed_show(opts);
         return opts;
       }
     };
 
-    CLI_RUN(){
+    CLI_RUN() {
       Node::Api api{argm};
       fmt::print("Not supported yet\n");
-      auto local_deals = cliTry(api._->ClientListDeals(), "Getting local client deals...");
+      auto local_deals =
+          cliTry(api._->ClientListDeals(), "Getting local client deals...");
       // TODO(Markuus): make output;
     }
   };
 
-  struct Node_client_balances{
-    struct Args{
-      CLI_OPTIONAL("client", "specifies market  client", Address)client;
-      CLI_OPTS(){
-        Opts  opts;
+  struct Node_client_balances {
+    struct Args {
+      CLI_OPTIONAL("client", "specifies market  client", Address) client;
+      CLI_OPTS() {
+        Opts opts;
         client(opts);
         return opts;
       }
     };
 
-    CLI_RUN(){
+    CLI_RUN() {
       Node::Api api{argm};
-      Address addr = (args.client ? *args.client : cliTry(api._->WalletDefaultAddress(), "Getting address of default wallet..."));
+      Address addr =
+          (args.client ? *args.client
+                       : cliTry(api._->WalletDefaultAddress(),
+                                "Getting address of default wallet..."));
       auto balance = cliTry(api._->StateMarketBalance(addr, TipsetKey()));
 
-
       fmt::print("  Escrowed Funds:        {}\n", AttoFil{balance.escrow});
       fmt::print("  Locked Funds:          {}\n", AttoFil{balance.locked});
-      //TODO: Reserved and Avaliable
+      // TODO: Reserved and Avaliable
     }
   };
 <<<<<<< HEAD
 >>>>>>> 172a64dc (client methods cli updates)
 =======
 
-
-  struct Node_client_getDeal: Empty{
-    CLI_RUN(){
+  struct Node_client_getDeal : Empty {
+    CLI_RUN() {
       Node::Api api{argm};
       auto proposal_cid{cliArgv<CID>(argv, 0, "proposal cid of deal to get")};
       // TODO: Client getDealInfo
     }
   };
 
-  struct Node_client_stat: Empty{
+  struct Node_client_stat : Empty {
     CLI_RUN() {
       Node::Api api{argm};
       auto cid{cliArgv<CID>(argv, 0, " cid of localy stored file")};
-      //auto deal_size = cliTry(api._->);
-      //TODO: CLientDealSize;
+      // auto deal_size = cliTry(api._->);
+      // TODO: CLientDealSize;
     }
-
   };
 
+  struct Node_client_listTransfers {
+    struct Args {
+      CLI_BOOL("completed", "show completed data transfers") completed;
+      CLI_BOOL("watch",
+               "watch deal updates in real-time, rather than a one time list")
+      watch;
+      CLI_BOOL("show-failed", "show failed/cancelled transfers") failed_show;
 
+      CLI_OPTS() {
+        Opts opts;
+        completed(opts);
+        watch(opts);
+        failed_show(opts);
+        return opts;
+      }
+    };
 
+<<<<<<< HEAD
 >>>>>>> 490821f3 (client updates)
+=======
+    CLI_RUN() {
+      fmt::print("Not supported yet");
+      // TODO: ClientListDataTransfers
+    }
+  };
+>>>>>>> f1466404 (client updates)
+
+  struct Node_client_grantDatacap {
+    struct Args {
+      CLI_OPTIONAL("from",
+                   "specifies the adrress of notary to send message from",
+                   Address)
+      from;
+      CLI_OPTS() {
+        Opts opts;
+        from(opts);
+        return opts;
+      }
+    };
 
+    CLI_RUN() {
+      auto target{cliArgv<Address>(argv, 0, "target address")};
+      auto allowness{cliArgv<AttoFil>(argv, 1, "amount")};
+    }
+  };
 
 }  // namespace fc::cli::_node