Merge pull request #479 from crypto-chassis/develop

Release

Author: chassis-community

Diff for: .github/workflows/release.yml

@@ -34,7 +34,7 @@ jobs:
                           {"type": "test", "release": "patch"},
                           {"type": "minor", "release": "minor"},
                           {"type": "major", "release": "major"},
-                          {"type": "dev", "release": "patch"}
+                          {"type": "misc", "release": "patch"}
                         ]
                       }], ["@semantic-release/release-notes-generator", {
                         "preset": "conventionalcommits"

Diff for: LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 cryptochassis
+Copyright (c) Crypto Chassis
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Diff for: README.md

@@ -1,4 +1,4 @@
-# Announcement: We have upgraded bybit API from v3 to v5 due to bybit will discontinue v3 on August 31, 2024. We've moved derivatives support from bybit-derivatives to bybit and updated documentions accordingly (See #specify-instrument-type section). We've also added websocket balance/position realtime update support on bybit. In addition, please use bybit's Unified Trading Account (https://www.bybit.com/en/help-center/article/Introduction-to-Bybit-Unified-Trading-Account) for best API support. Thank you.
+# Announcement: We have upgraded bybit API from v3 to v5 due to bybit will discontinue v3 on August 31, 2024. We've moved derivatives support from bybit-derivatives to bybit and updated documentations accordingly (See #specify-instrument-type section). We've also added websocket balance/position realtime update support on bybit. In addition, please use bybit's Unified Trading Account (https://www.bybit.com/en/help-center/article/Introduction-to-Bybit-Unified-Trading-Account) for best API support. Thank you.
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
@@ -64,8 +64,6 @@
   * FIX: coinbase, gemini.
 * A spot market making application is provided as an end-to-end solution for liquidity providers.
 * A single order execution application is provided as an end-to-end solution for executing large orders.
-* To spur innovation and industry collaboration, this library is open for use by the public without cost.
-* We specialize in market data collection, high speed trading system, infrastructure optimization, and proprietary market making. Hire us as engineers, liquidity providers, traders, or asset managers.
 * Join us on Discord https://discord.gg/b5EKcp9s8T and Medium https://cryptochassis.medium.com.
 
 ## Branches

Diff for: 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 for: 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 for: 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 for: 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() {}
 };