june's update

CMakeLists.txt

@@ -5,7 +5,7 @@ project(huobi LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 17)
 
 set(huobi_VERSION_MAJOR 2)
-set(huobi_VERSION_MINOR 1)
+set(huobi_VERSION_MINOR 2)
 
 configure_file(
         "${PROJECT_SOURCE_DIR}/huobiConfig.h.in"
@@ -15,6 +15,7 @@ configure_file(
 include_directories("${PROJECT_SOURCE_DIR}/include")
 
 include_directories(/usr/local/include)
+include_directories(/usr/local/opt/[email protected]/include)
 include_directories(/opt/cpprest-2.10.16/include)
 
 

README.md

@@ -12,7 +12,7 @@ If you already use SDK v1, it is strongly suggested migrate to v2 as we refactor
   - [Installation](#Installation)
   - [Run examples](#Run-examples)
   - [Client](#client)
-- [Migrate from v1](#Migrate-from-v1)
+  - [Migrate from v1](#Migrate-from-v1)
 - [Request example](#Request-example)
   - [Reference data](#Reference-data)
   - [Market data](#Market-data)

demo/CMakeLists.txt

@@ -0,0 +1,22 @@
+cmake_minimum_required(VERSION 3.10...3.17)
+project(demo LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 17)
+
+include_directories(/usr/local/huobi)
+
+add_subdirectory(account)
+add_subdirectory(crossmargin)
+add_subdirectory(isolatedmargin)
+add_subdirectory(market)
+add_subdirectory(reference)
+add_subdirectory(trade)
+add_subdirectory(wallet)
+add_subdirectory(websocketAsset)
+add_subdirectory(websocketMarket)
+add_subdirectory(websocketOrders)
+
+find_package(cpprestsdk REQUIRED)
+
+link_directories(/usr/local/lib/)
+link_directories(/usr/local/huobi/)

demo/account/accountdemo.cpp

@@ -1,4 +1,3 @@
-
 #include <client/accountClient.h>
 
 using namespace std;
@@ -23,15 +22,9 @@ int main() {
     FuturesTransferRequest futuresTransferRequest{"usdt", "0.2", "futures-to-pro"};
     cout << accountClient.futuresTransfer(futuresTransferRequest) << endl;
 
-    vector<Balance> subbalanceVec = accountClient.getSubuserAggregateBalance();
-    cout << subbalanceVec[0].currency << endl;
-
     vector<AccountAndBalance> accountAndBalanceVec= accountClient.getSubuidAccount(12345);
     cout << accountAndBalanceVec[0].symbol << endl;
 
-    ManageSubUserRequest manageSubUserRequest{12345, "lock"};
-    accountClient.manageSubUser(manageSubUserRequest);
-
     return 0;
 }
 

demo/algo/CMakeLists.txt

@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.10...3.17)
+project(account LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 17)
+
+include_directories(/usr/local/huobi)
+
+find_package(cpprestsdk REQUIRED)
+
+link_directories(/usr/local/lib/)
+link_directories(/usr/local/huobi/)
+
+ADD_EXECUTABLE(algodemo ./algodemo.cpp)
+
+target_link_libraries(algodemo huobi curl ssl crypto cpprestsdk::cpprest z)

demo/algo/algodemo.cpp

@@ -0,0 +1,24 @@
+#include <client/algoClient.h>
+
+using namespace std;
+
+int main() {
+    AlgoClient algoClient{APIKEY, SECRETKEY};
+    CreateAlgoOrderRequest createAlgoOrderRequest;
+    createAlgoOrderRequest.orderType = "market";
+    createAlgoOrderRequest.symbol = "htusdt";
+    createAlgoOrderRequest.stopPrice = "4";
+    createAlgoOrderRequest.orderSide = "sell";
+    createAlgoOrderRequest.orderSize = "10";
+    createAlgoOrderRequest.clientOrderId = "clientOrderId";
+    cout << algoClient.createAlgoOrder(createAlgoOrderRequest) << endl;
+
+    AlgoOrder algoOrder = algoClient.specificAlgoOrder("clientOrderId");
+    cout << algoOrder.clientOrderId << endl;
+    vector<string> cancelOrders;
+    cancelOrders.push_back("aaa");
+    CancelAlgoOrderResult cancelAlgoOrderResult = algoClient.cancelAlgoOrder(cancelOrders);
+    cout << cancelAlgoOrderResult.rejected[0] << endl;
+    return 0;
+}
+

demo/crossmargin/crossmargindemo.cpp

@@ -1,5 +1,3 @@
-
-
 #include <client/crossMarginClient.h>
 
 using namespace std;

demo/isolatedmargin/isolatedmargindemo.cpp

@@ -1,5 +1,3 @@
-
-
 #include <client/isolatedMarginClient.h>
 
 using namespace std;

demo/reference/referencedemo.cpp

@@ -1,5 +1,3 @@
-
-
 #include <iostream>
 #include <client/referenceClient.h>
 

demo/subuser/CMakeLists.txt

@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.10...3.17)
+project(account LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 17)
+
+include_directories(/usr/local/huobi)
+
+find_package(cpprestsdk REQUIRED)
+
+link_directories(/usr/local/lib/)
+link_directories(/usr/local/huobi/)
+
+ADD_EXECUTABLE(subuserdemo ./subuserdemo.cpp)
+
+target_link_libraries(subuserdemo huobi curl ssl crypto cpprestsdk::cpprest z)

demo/subuser/subuserdemo.cpp

@@ -0,0 +1,39 @@
+
+#include <client/subUserClient.h>
+
+using namespace std;
+
+int main() {
+    SubUserClient subUserClient{APIKEY, SECRETKEY};
+
+    vector<Balance> subbalanceVec = subUserClient.getSubuserAggregateBalance();
+    cout << subbalanceVec[0].currency << endl;
+
+    ManageSubUserRequest manageSubUserRequest{12345, "lock"};
+    subUserClient.manageSubUser(manageSubUserRequest);
+
+    QuerySubUserDepositRequest querySubUserDepositRequest{12345};
+    vector<SubUserDeposit> subUserDepositVec = subUserClient.querySubUserDeposit(querySubUserDepositRequest);
+    for (SubUserDeposit deposit:subUserDepositVec) {
+        cout << deposit.amount << endl;
+    }
+
+    SubUserCreationRequest subUserCreationRequest;
+    subUserCreationRequest.userName = "userName";
+    subUserCreationRequest.note = "note";
+   vector<SubUserCreationRequest> subUserCreationRequestVec{subUserCreationRequest};
+    vector<CreateSubUserResponse> createSubUserResponseVec = subUserClient.subUserCreation(subUserCreationRequestVec);
+    cout << createSubUserResponseVec[0].userName << endl;
+
+    SubUserTradableMarketRequest subUserTradableMarketRequest{"12345","spot","activated"};
+    vector<SubUserTradableMarketResponse> subUserTradableMarketResponseVec = subUserClient.subUserTradableMarket(subUserTradableMarketRequest);
+    cout << subUserTradableMarketResponseVec[0].activation << endl;
+
+    SubUserTransferabilityRequest subUserTransferabilityRequest{"12345", "spot",true};
+    vector<SubUserTransferabilityResponse> subUserTransferabilityResponseVec = subUserClient.subUserTransferability(subUserTransferabilityRequest);
+    cout << subUserTransferabilityResponseVec[0].transferrable << endl;
+
+    return 0;
+}
+
+

demo/trade/tradedemo.cpp

@@ -1,5 +1,3 @@
-
-
 #include <client/tradeClient.h>
 
 using namespace std;

demo/wallet/walletdemo.cpp

@@ -1,5 +1,3 @@
-
-
 #include <client/walletClient.h>
 
 using namespace std;
@@ -41,10 +39,5 @@ int main() {
         cout << withdraw.amount << endl;
     }
 
-    QuerySubUserDepositRequest querySubUserDepositRequest{12345};
-    vector<SubUserDeposit> subUserDepositVec = walletClient.querySubUserDeposit(querySubUserDepositRequest);
-    for (SubUserDeposit deposit:subUserDepositVec) {
-        cout << deposit.amount << endl;
-    }
     return 0;
 }

demo/websocketAsset/websocketAssetdemo.cpp

@@ -1,12 +1,10 @@
-
-
 #include <iostream>
 #include <client/websocketAssetClient.h>
 
 using namespace std;
 
 int main() {
-    websocketAssetClient client{APIKEY, SECRETKEY};
+    WebsocketAssetClient client{APIKEY, SECRETKEY};
 
     client.subAccounts(1, [](AccountsUpdate accountsUpdate) {
         cout << accountsUpdate.changeType << endl;

demo/websocketMarket/websocketMarketdemo.cpp

@@ -1,11 +1,10 @@
-
 #include <iostream>
 #include <client/websocketMarketClient.h>
 
 using namespace std;
 
 int main() {
-    websocketMarketClient client;
+    WebsocketMarketClient client;
     const char *symbol = "htusdt";
     client.subKline(symbol, "1min", [](Candlestick candlestick) {
         cout << candlestick.amount << endl;

demo/websocketOrders/websocketOrdersdemo.cpp

@@ -1,12 +1,10 @@
-
-
 #include <iostream>
 #include <client/websocketOrdersClient.h>
 
 using namespace std;
 
 int main() {
-    websocketOrdersClient client{APIKEY, SECRETKEY};
+    WebsocketOrdersClient client{APIKEY, SECRETKEY};
 
     client.subOrders("htusdt", [](OrdersUpdate ordersUpdate) {
         cout << ordersUpdate.symbol << endl;

docker/Dockerfile

@@ -0,0 +1,45 @@
+#
+# Ubuntu Dockerfile
+#
+# https://github.com/dockerfile/ubuntu
+#
+
+# Pull base image.
+FROM ubuntu:18.04
+
+# Install.
+RUN \
+  sed -i 's/# \(.*multiverse$\)/\1/g' /etc/apt/sources.list && \
+  apt-get update && \
+  apt-get -y upgrade && \
+  apt-get install -y build-essential && \
+  apt-get install -y curl git vim wget cmake && \
+  apt-get install -y libssl-dev libcurl4-openssl-dev zlib1g-dev libcpprest-dev && \
+  rm -rf /var/lib/apt/lists/*
+
+# Set environment variables.
+ENV HOME /root
+
+# Define working directory.
+WORKDIR /root
+
+RUN \
+  git clone https://github.com/huobiapi/huobi_Cpp.git && \
+  cd huobi_Cpp && \
+  mkdir build && \
+  cd build && \
+  cmake .. -DCMAKE_PREFIX_PATH=/opt/cpprest-2.10.16/lib64/cmake/ && \
+  make && \
+  make install
+
+WORKDIR /root
+
+RUN \
+  cd huobi_Cpp/demo/reference && \
+  mkdir build && \
+  cd build && \
+  cmake .. -DCMAKE_PREFIX_PATH=/opt/cpprest-2.10.16/lib64/cmake/ -DCMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu/cmake && \
+  make
+
+# Define default command.
+CMD ["bash"]

include/client/accountClient.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_ACCOUNTCLIENT_H
 #define HUOBI_ACCOUNTCLIENT_H
 
@@ -22,13 +20,9 @@ struct AccountClient {
 
     long futuresTransfer(FuturesTransferRequest &request);
 
-    long subuserTransfer(SubuserTransferRequest &request);
-
-    vector<Balance> getSubuserAggregateBalance();
-
     vector<AccountAndBalance> getSubuidAccount(long subUid);
 
-    void manageSubUser(ManageSubUserRequest &request);
+    AccountTransferResponse accountTransfer(AccountTransferRequest &request);
 
 private:
     Signature signature;

include/client/algoClient.h

@@ -0,0 +1,29 @@
+
+#ifndef HUOBI_ALGOCLIENT_H
+#define HUOBI_ALGOCLIENT_H
+
+#include "include.h"
+#include <vector>
+
+using namespace rapidjson;
+using namespace std;
+
+struct AlgoClient {
+
+    AlgoClient(char *accessKey, char *secretKey) : signature{accessKey, secretKey} {
+    }
+
+    std::string createAlgoOrder(CreateAlgoOrderRequest &request);
+
+    std::vector<AlgoOrder> openingAlgoOrders(OpeningAlgoOrdersRequest &request);
+
+    std::vector<AlgoOrder> historyAlgoOrders(HistoryAlgoOrdersRequest &request);
+
+    AlgoOrder specificAlgoOrder(std::string clientOrderId);
+
+    CancelAlgoOrderResult cancelAlgoOrder(vector<std::string>clientOrderIds);
+private:
+    Signature signature;
+};
+
+#endif //HUOBI_ALGOCLIENT_H

include/client/crossMarginClient.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_CROSSMARGINCLIENT_H
 #define HUOBI_CROSSMARGINCLIENT_H
 

include/client/isolatedMarginClient.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_ISOLATEDMARGINCLIENT_H
 #define HUOBI_ISOLATEDMARGINCLIENT_H
 

include/client/marketClient.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_MARKETCLIENT_H
 #define HUOBI_MARKETCLIENT_H
 
@@ -23,6 +21,9 @@ struct MarketClient {
     std::vector<Trade> getHistoryTrade(HistoryTradeRequest &request);
 
     Candlestick getDetail(const char *symbol);
+
+    MarketStatus getMarketStatus();
+
 };
 
 #endif //HUOBI_MARKETCLIENT_H

include/client/referenceClient.h

@@ -1,5 +1,3 @@
-
-
 #ifndef HUOBI_REFERENCECLIENT_H
 #define HUOBI_REFERENCECLIENT_H