Merge pull request #477 from obergaba/develop

feat: Update Bitget market service APIs and WS from v1 to v2
crypto-chassis · Aug 24, 2024 · ba3f3f5 · ba3f3f5
2 parents dccc5f7 + 4b41c2c
commit ba3f3f5
Show file tree

Hide file tree

Showing 6 changed files with 150 additions and 63 deletions.
diff --git a/include/ccapi_cpp/ccapi_macro.h b/include/ccapi_cpp/ccapi_macro.h
@@ -364,7 +364,7 @@
 #define CCAPI_WEBSOCKET_BITGET_BASE_CHANNEL_BOOKS1 "books1"
 #define CCAPI_WEBSOCKET_BITGET_BASE_CHANNEL_BOOKS5 "books5"
 #define CCAPI_WEBSOCKET_BITGET_BASE_CHANNEL_BOOKS15 "books15"
-#define CCAPI_WEBSOCKET_BITGET_BASE_CHANNEL_TRADES "trade"
+#define CCAPI_WEBSOCKET_BITGET_BASE_CHANNEL_KLINE "candle"
 #define CCAPI_WEBSOCKET_BITMART_CHANNEL_TRADE "spot/trade"
 #define CCAPI_WEBSOCKET_BITMART_CHANNEL_PUBLIC_DEPTH5 "spot/depth5"
 #define CCAPI_WEBSOCKET_BITMART_CHANNEL_PUBLIC_DEPTH20 "spot/depth20"

diff --git a/include/ccapi_cpp/ccapi_session.h b/include/ccapi_cpp/ccapi_session.h
@@ -636,6 +636,18 @@ class Session {
           return;
         }
         subscription.setInstrumentType(instrumentType);
+        } else if (exchange == CCAPI_EXCHANGE_NAME_BITGET_FUTURES) {
+        auto instrumentType = subscription.getInstrumentType();
+        if (instrumentType.empty()) {
+          instrumentType = "USDT-FUTURES";
+        }
+        std::vector<std::string> instrumentTypeList = {"USDT-FUTURES", "COIN-FUTURES", "USDC-FUTURES"};
+        if (std::find(instrumentTypeList.begin(), instrumentTypeList.end(), instrumentType) == instrumentTypeList.end()) {
+          this->onError(Event::Type::SUBSCRIPTION_STATUS, Message::Type::SUBSCRIPTION_FAILURE,
+                        "unsupported exchange instrument types: " + toString(instrumentType) + ". Allowed values: " + toString(instrumentTypeList) + ".");
+          return;
+        }
+        subscription.setInstrumentType(instrumentType);
       }
     }
     std::map<std::string, std::vector<Subscription> > subscriptionListByServiceNameMap;

diff --git a/include/ccapi_cpp/ccapi_session_configs.h b/include/ccapi_cpp/ccapi_session_configs.h
@@ -157,10 +157,12 @@ class SessionConfigs CCAPI_FINAL {
     std::map<std::string, std::string> fieldWebsocketChannelMapBitget = {
         {CCAPI_TRADE, CCAPI_WEBSOCKET_BITGET_BASE_CHANNEL_TRADES},
         {CCAPI_MARKET_DEPTH, CCAPI_WEBSOCKET_BITGET_BASE_CHANNEL_BOOKS},
+        {CCAPI_CANDLESTICK, CCAPI_WEBSOCKET_BITGET_BASE_CHANNEL_KLINE},
     };
     std::map<std::string, std::string> fieldWebsocketChannelMapBitgetFutures = {
         {CCAPI_TRADE, CCAPI_WEBSOCKET_BITGET_BASE_CHANNEL_TRADES},
         {CCAPI_MARKET_DEPTH, CCAPI_WEBSOCKET_BITGET_BASE_CHANNEL_BOOKS},
+        {CCAPI_CANDLESTICK, CCAPI_WEBSOCKET_BITGET_BASE_CHANNEL_KLINE},
     };
     std::map<std::string, std::string> fieldWebsocketChannelMapBitmart = {
         {CCAPI_TRADE, CCAPI_WEBSOCKET_BITMART_CHANNEL_TRADE},

diff --git a/include/ccapi_cpp/service/ccapi_market_data_service_bitget.h b/include/ccapi_cpp/service/ccapi_market_data_service_bitget.h
@@ -10,7 +10,7 @@ class MarketDataServiceBitget : public MarketDataServiceBitgetBase {
                           ServiceContext* serviceContextPtr)
       : MarketDataServiceBitgetBase(eventHandler, sessionOptions, sessionConfigs, serviceContextPtr) {
     this->exchangeName = CCAPI_EXCHANGE_NAME_BITGET;
-    this->baseUrlWs = sessionConfigs.getUrlWebsocketBase().at(this->exchangeName) + "/spot/v1/stream";
+    this->baseUrlWs = sessionConfigs.getUrlWebsocketBase().at(this->exchangeName) + "/v2/ws/public";
     this->baseUrlRest = sessionConfigs.getUrlRestBase().at(this->exchangeName);
     this->setHostRestFromUrlRest(this->baseUrlRest);
     this->setHostWsFromUrlWs(this->baseUrlWs);
@@ -27,9 +27,12 @@ class MarketDataServiceBitget : public MarketDataServiceBitgetBase {
     //       CCAPI_LOGGER_FATAL(std::string("e.what() = ") + e.what());
     //     }
     // #endif
-    this->getRecentTradesTarget = "/api/spot/v1/market/fills";
-    this->getInstrumentTarget = "/api/spot/v1/public/product";
-    this->getInstrumentsTarget = "/api/spot/v1/public/products";
+    this->getRecentTradesTarget = "/api/v2/spot/market/fills";
+    this->getHistoricalTradesTarget = "/api/v2/spot/market/fills-history";
+    this->getInstrumentTarget = "/api/v2/spot/public/symbols";
+    this->getInstrumentsTarget = "/api/v2/spot/public/symbols";
+    this->getRecentCandlesticksTarget = "/api/v2/spot/market/candles";
+    this->getHistoricalCandlesticksTarget = "/api/v2/spot/market/candles";
   }
   virtual ~MarketDataServiceBitget() {}
 };