Add public transfer command

Author: cloudnoize

utt/wallet-cli/include/wallet.hpp

@@ -55,6 +55,11 @@ class Wallet {
   /// @param recipient The user id of the recipient
   void transfer(Channel& chan, uint64_t amount, const std::string& recipient);
 
+  /// @brief  Transfer public (ERC20) funds from wallet to address.
+  /// @param amount The amount of public funds to transfer
+  /// @param recipient The user id of the recipient
+  void publicTransfer(Channel& chan, uint64_t amount, const std::string& recipient);
+
   /// @brief Burns the desired amount of private funds and converts them to public funds.
   /// @param amount The amount of private funds to burn.
   void burn(Channel& chan, uint64_t amount);
@@ -67,6 +72,9 @@ class Wallet {
   void syncState(Channel& chan, uint64_t lastKnownTxNum = 0);
   void updateBudget(Channel& chan);
 
+  /// @brief Updates the ERC20 balance of the wallet.
+  void updatePublicBalance(Channel& chan);
+
   struct DummyUserStorage : public utt::client::IUserStorage {};
 
   DummyUserStorage storage_;

utt/wallet-cli/proto/api/v1/wallet-api.proto

@@ -120,6 +120,17 @@ message GetPublicBalanceResponse {
     optional uint64 public_balance = 2;
 }
 
+message PublicTransferRequest {
+    optional string user_id = 1;
+    optional string recipient = 2;
+    optional uint64 value = 3;
+}
+
+message PublicTransferResponse {
+    optional string err = 1;
+}
+
+
 message WalletRequest {
     oneof req {
         // init
@@ -135,6 +146,8 @@ message WalletRequest {
         GetSignedTransactionRequest get_signed_tx = 8;
 
         GetPrivacyBudgetRequest get_privacy_budget = 9;
+
+        PublicTransferRequest public_transfer = 10;
     }
 }
 
@@ -154,5 +167,7 @@ message WalletResponse {
         GetSignedTransactionResponse get_signed_tx = 9;
 
         GetPrivacyBudgetResponse get_privacy_budget = 10;
+
+        PublicTransferResponse public_transfer = 11;
     }
 }

utt/wallet-cli/src/main.cpp

@@ -56,6 +56,8 @@ void printHelp() {
   std::cout << "register <user-id>        -- requests user registration required for spending coins\n";
   std::cout << "mint <amount>             -- mint the requested amount of public funds.\n";
   std::cout << "transfer <amount> <to-user-id> -- transfers the specified amount between users.\n";
+  std::cout
+      << "public-transfer <amount> <to-user-id> -- transfers the specified amount of public funds between users.\n";
   std::cout << "burn <amount>             -- burns the specified amount of private funds to public funds.\n";
   std::cout << '\n';
 }
@@ -137,6 +139,20 @@ struct CLIApp {
     wallet->showInfo(chan);
   }
 
+  void publicTransferCmd(const std::vector<std::string>& cmdTokens) {
+    if (cmdTokens.size() != 3) {
+      std::cout << "Usage: transfer <amount> <recipient>\n";
+      return;
+    }
+    int amount = std::atoi(cmdTokens[1].c_str());
+    if (amount <= 0) {
+      std::cout << "Expected a positive transfer amount!\n";
+      return;
+    }
+    wallet->publicTransfer(chan, (uint64_t)amount, cmdTokens[2]);
+    wallet->showInfo(chan);
+  }
+
   void burnCmd(const std::vector<std::string>& cmdTokens) {
     if (cmdTokens.size() != 2) {
       std::cout << "Usage: burn <amount>\n";
@@ -215,6 +231,8 @@ int main(int argc, char* argv[]) {
           app.mintCmd(cmdTokens);
         } else if (cmdTokens[0] == "transfer") {
           app.transferCmd(cmdTokens);
+        } else if (cmdTokens[0] == "public-transfer") {
+          app.publicTransferCmd(cmdTokens);
         } else if (cmdTokens[0] == "burn") {
           app.burnCmd(cmdTokens);
         } else if (cmdTokens[0] == "debug") {

utt/wallet-cli/src/wallet.cpp

@@ -196,6 +196,35 @@ void Wallet::transfer(Channel& chan, uint64_t amount, const std::string& recipie
   std::cout << "Anonymous transfer done.\n";
 }
 
+void Wallet::publicTransfer(Channel& chan, uint64_t amount, const std::string& recipient) {
+  updatePublicBalance(chan);
+  if (publicBalance_ < amount) {
+    std::cout << "Insufficient public balance!\n";
+    return;
+  }
+  std::cout << "Processing public transfer of " << amount << " to " << recipient << "...\n";
+
+  WalletRequest req;
+  auto& publicTrnasfer = *req.mutable_public_transfer();
+  publicTrnasfer.set_user_id(userId_);
+  publicTrnasfer.set_recipient(recipient);
+  publicTrnasfer.set_value(amount);
+  chan->Write(req);
+
+  WalletResponse resp;
+  chan->Read(&resp);
+
+  if (!resp.has_public_transfer()) throw std::runtime_error("Expected public_transfer response from wallet service!");
+  const auto& publicTransferResp = resp.public_transfer();
+
+  if (publicTransferResp.has_err()) {
+    std::cout << publicTransferResp.err() << "\n";
+    return;
+  }
+
+  std::cout << "Public transfer done.\n";
+}
+
 void Wallet::burn(Channel& chan, uint64_t amount) {
   if (user_->getBalance() < amount) {
     std::cout << "Insufficient private balance!\n";
@@ -279,27 +308,28 @@ void Wallet::updateBudget(Channel& chan) {
   user_->updatePrivacyBudget(budget, sig);
 }
 
-void Wallet::syncState(Channel& chan, uint64_t lastKnownTxNum) {
-  std::cout << "Synchronizing state...\n";
-
-  // Update public balance
-  {
-    WalletRequest req;
-    req.mutable_get_public_balance()->set_user_id(userId_);
-    chan->Write(req);
+void Wallet::updatePublicBalance(Channel& chan) {
+  WalletRequest req;
+  req.mutable_get_public_balance()->set_user_id(userId_);
+  chan->Write(req);
 
-    WalletResponse resp;
-    chan->Read(&resp);
-    if (!resp.has_get_public_balance())
-      throw std::runtime_error("Expected get public balance response from wallet service!");
-    const auto& getPubBalanceResp = resp.get_public_balance();
+  WalletResponse resp;
+  chan->Read(&resp);
+  if (!resp.has_get_public_balance())
+    throw std::runtime_error("Expected get public balance response from wallet service!");
+  const auto& getPubBalanceResp = resp.get_public_balance();
 
-    if (getPubBalanceResp.has_err()) {
-      std::cout << "Failed to get public balance:" << resp.err() << '\n';
-    } else {
-      publicBalance_ = getPubBalanceResp.public_balance();
-    }
+  if (getPubBalanceResp.has_err()) {
+    std::cout << "Failed to get public balance:" << resp.err() << '\n';
+  } else {
+    publicBalance_ = getPubBalanceResp.public_balance();
   }
+}
+
+void Wallet::syncState(Channel& chan, uint64_t lastKnownTxNum) {
+  std::cout << "Synchronizing state...\n";
+
+  updatePublicBalance(chan);
 
   updateBudget(chan);