[Upbit] Addition of net_type required parameter for withdraw-apply

sjanel · Jan 4, 2024 · c8b734c · c8b734c
1 parent afedf38
commit c8b734c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/api/exchanges/src/upbitprivateapi.cpp b/src/api/exchanges/src/upbitprivateapi.cpp
@@ -129,8 +129,7 @@ UpbitPrivate::UpbitPrivate(const CoincenterInfo& config, UpbitPublic& upbitPubli
 bool UpbitPrivate::validateApiKey() {
   json ret =
       PrivateQuery(_curlHandle, _apiKey, HttpRequestType::kGet, "/v1/api_keys", CurlPostData(), IfError::kNoThrow);
-  auto errorIt = ret.find("error");
-  return errorIt == ret.end() && !ret.empty();
+  return !ret.empty() && ret.find("error") == ret.end();
 }
 
 CurrencyExchangeFlatSet UpbitPrivate::TradableCurrenciesFunc::operator()() {
@@ -173,17 +172,20 @@ CurrencyExchangeFlatSet UpbitPrivate::TradableCurrenciesFunc::operator()() {
 }
 
 BalancePortfolio UpbitPrivate::queryAccountBalance(const BalanceOptions& balanceOptions) {
-  BalancePortfolio ret;
-  bool withBalanceInUse =
+  const bool withBalanceInUse =
       balanceOptions.amountIncludePolicy() == BalanceOptions::AmountIncludePolicy::kWithBalanceInUse;
-  CurrencyCode equiCurrency = balanceOptions.equiCurrency();
+  const CurrencyCode equiCurrency = balanceOptions.equiCurrency();
+
+  BalancePortfolio ret;
   for (const json& accountDetail : PrivateQuery(_curlHandle, _apiKey, HttpRequestType::kGet, "/v1/accounts")) {
-    CurrencyCode currencyCode(accountDetail["currency"].get<std::string_view>());
-    MonetaryAmount availableAmount(accountDetail["balance"].get<std::string_view>(), currencyCode);
+    const CurrencyCode currencyCode(accountDetail["currency"].get<std::string_view>());
+    const MonetaryAmount availableAmount(accountDetail["balance"].get<std::string_view>(), currencyCode);
+
     this->addBalance(ret, availableAmount, equiCurrency);
 
     if (withBalanceInUse) {
-      MonetaryAmount amountInUse(accountDetail["locked"].get<std::string_view>(), currencyCode);
+      const MonetaryAmount amountInUse(accountDetail["locked"].get<std::string_view>(), currencyCode);
+
       this->addBalance(ret, amountInUse, equiCurrency);
     }
   }
@@ -597,6 +599,7 @@ InitiatedWithdrawInfo UpbitPrivate::launchWithdraw(MonetaryAmount grossAmount, W
   MonetaryAmount withdrawFee = _exchangePublic.queryWithdrawalFeeOrZero(currencyCode);
   MonetaryAmount netEmittedAmount = grossAmount - withdrawFee;
   CurlPostData withdrawPostData{{"currency", currencyCode.str()},
+                                {"net_type", currencyCode.str()},
                                 {"amount", netEmittedAmount.amountStr()},
                                 {"address", destinationWallet.address()}};
   if (destinationWallet.hasTag()) {

diff --git a/src/api/exchanges/test/commonapi_test.hpp b/src/api/exchanges/test/commonapi_test.hpp
@@ -78,7 +78,10 @@ class TestAPI {
     // if (exchangePrivateOpt) {
     //   json d;
     //   for (const auto &c : currencies) {
-    //     d[string(c.standardStr())] = *exchangePrivateOpt->queryWithdrawalFee(c.standardCode()).amountStr();
+    //     const auto optFeeAmount = exchangePrivateOpt->queryWithdrawalFee(c.standardCode());
+    //     if (optFeeAmount) {
+    //       d[c.standardStr()] = optFeeAmount->amountStr();
+    //     }
     //   }
     //   std::cout << d.dump(2) << '\n';
     // }