Merge pull request #7 from bitrich-info/develop

merge
matejsp · Jan 14, 2019 · b992cbf · b992cbf
2 parents 3780aa4 + e27763b
commit b992cbf
Show file tree

Hide file tree

Showing 33 changed files with 184 additions and 172 deletions.
diff --git a/README.md b/README.md
@@ -114,6 +114,11 @@ GDAX authenticated live updates are not yet supported, hopefully it will be adde
 
 If you missing a specific exchange implementation, feel free to propose a pull request or open an issue with some sweet BTC bounty. 
 
+## Open Source Projects Using XChange-Stream
+
+This is an, not so complete, list of projects that use XChange-Stream, feel free to add your project below.
+- [XChange-Trade-Bot](https://github.com/yurivin/xchange-trade-bot) by yurivin
+- [Crypto Websockets](https://github.com/firepol/crypto-websockets) by firepol
 
 ## License
 Copyright 2017 Zdenek Dolezal, Michal Oprendek

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>info.bitrich.xchange-stream</groupId>
     <artifactId>xchange-stream-parent</artifactId>
     <packaging>pom</packaging>
-    <version>4.3.12-SNAPSHOT</version>
+    <version>4.3.13-SNAPSHOT</version>
 
     <modules>
         <module>xchange-stream-core</module>
@@ -19,7 +19,7 @@
         <module>xchange-okcoin</module>
         <module>xchange-poloniex</module>
         <module>xchange-coinmate</module>
-        <module>xchange-gdax</module>
+        <module>xchange-coinbasepro</module>
         <module>xchange-bitfinex</module>
         <module>xchange-bitmex</module>
         <module>xchange-poloniex2</module>
@@ -80,7 +80,7 @@
     </repositories>
 
     <properties>
-        <xchange.version>4.3.11</xchange.version>
+        <xchange.version>4.3.13</xchange.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>

diff --git a/service-core/pom.xml b/service-core/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>xchange-stream-parent</artifactId>
         <groupId>info.bitrich.xchange-stream</groupId>
-        <version>4.3.12-SNAPSHOT</version>
+        <version>4.3.13-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/service-netty/pom.xml b/service-netty/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>xchange-stream-parent</artifactId>
         <groupId>info.bitrich.xchange-stream</groupId>
-        <version>4.3.12-SNAPSHOT</version>
+        <version>4.3.13-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/service-pubnub/pom.xml b/service-pubnub/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>xchange-stream-parent</artifactId>
         <groupId>info.bitrich.xchange-stream</groupId>
-        <version>4.3.12-SNAPSHOT</version>
+        <version>4.3.13-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/service-pusher/pom.xml b/service-pusher/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>xchange-stream-parent</artifactId>
         <groupId>info.bitrich.xchange-stream</groupId>
-        <version>4.3.12-SNAPSHOT</version>
+        <version>4.3.13-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/service-wamp/pom.xml b/service-wamp/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>xchange-stream-parent</artifactId>
         <groupId>info.bitrich.xchange-stream</groupId>
-        <version>4.3.12-SNAPSHOT</version>
+        <version>4.3.13-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/xchange-binance/pom.xml b/xchange-binance/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>xchange-stream-parent</artifactId>
         <groupId>info.bitrich.xchange-stream</groupId>
-        <version>4.3.12-SNAPSHOT</version>
+        <version>4.3.13-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/xchange-bitfinex/pom.xml b/xchange-bitfinex/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>xchange-stream-parent</artifactId>
         <groupId>info.bitrich.xchange-stream</groupId>
-        <version>4.3.12-SNAPSHOT</version>
+        <version>4.3.13-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...-bitfinex/src/main/java/info/bitrich/xchangestream/bitfinex/BitfinexStreamingService.java b/...-bitfinex/src/main/java/info/bitrich/xchangestream/bitfinex/BitfinexStreamingService.java
@@ -88,7 +88,7 @@ protected void handleMessage(JsonNode message) {
                 subscribedChannels.remove(channelId);
             } else if (event.textValue().equals(ERROR)) {
                 if (message.get("code").asInt() == SUBSCRIPTION_FAILED) {
-                    LOG.error("Error with message: " + message.get("msg"));
+                    LOG.error("Error with message: " + message.get("symbol") + " " + message.get("msg"));
                     return;
                 }
                 super.handleError(message, new ExchangeException("Error code: " + message.get("code").asText()));

diff --git a/...itfinex/src/main/java/info/bitrich/xchangestream/bitfinex/dto/BitfinexWebSocketTrade.java b/...itfinex/src/main/java/info/bitrich/xchangestream/bitfinex/dto/BitfinexWebSocketTrade.java
@@ -48,7 +48,6 @@ public BitfinexTrade toBitfinexTrade() {
         } else {
             type = "buy";
         }
-
-        return new BitfinexTrade(price, amount, timestamp / 1000, "bitfinex", tradeId, type);
+        return new BitfinexTrade(price, amount.abs(), timestamp / 1000, "bitfinex", tradeId, type);
     }
 }
diff --git a/xchange-bitflyer/pom.xml b/xchange-bitflyer/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>xchange-stream-parent</artifactId>
         <groupId>info.bitrich.xchange-stream</groupId>
-        <version>4.3.12-SNAPSHOT</version>
+        <version>4.3.13-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/xchange-bitmex/pom.xml b/xchange-bitmex/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>xchange-stream-parent</artifactId>
         <groupId>info.bitrich.xchange-stream</groupId>
-        <version>4.3.12-SNAPSHOT</version>
+        <version>4.3.13-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/xchange-bitstamp/pom.xml b/xchange-bitstamp/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>xchange-stream-parent</artifactId>
         <groupId>info.bitrich.xchange-stream</groupId>
-        <version>4.3.12-SNAPSHOT</version>
+        <version>4.3.13-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/xchange-cexio/pom.xml b/xchange-cexio/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>xchange-stream-parent</artifactId>
         <groupId>info.bitrich.xchange-stream</groupId>
-        <version>4.3.12-SNAPSHOT</version>
+        <version>4.3.13-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/xchange-gdax/pom.xml → xchange-coinbasepro/pom.xml b/xchange-gdax/pom.xml → xchange-coinbasepro/pom.xml
@@ -3,11 +3,11 @@
     <parent>
         <artifactId>xchange-stream-parent</artifactId>
         <groupId>info.bitrich.xchange-stream</groupId>
-        <version>4.3.12-SNAPSHOT</version>
+        <version>4.3.13-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>xchange-gdax</artifactId>
+    <artifactId>xchange-coinbasepro</artifactId>
 
     <dependencies>
         <dependency>
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>org.knowm.xchange</groupId>
-            <artifactId>xchange-gdax</artifactId>
+            <artifactId>xchange-coinbasepro</artifactId>
             <version>${xchange.version}</version>
         </dependency>
     </dependencies>

diff --git a/...ngestream/gdax/GDAXStreamingExchange.java → ...basepro/CoinbaseProStreamingExchange.java b/...ngestream/gdax/GDAXStreamingExchange.java → ...basepro/CoinbaseProStreamingExchange.java
@@ -1,26 +1,27 @@
-package info.bitrich.xchangestream.gdax;
+package info.bitrich.xchangestream.coinbasepro;
+
+import org.knowm.xchange.ExchangeSpecification;
+import org.knowm.xchange.coinbasepro.CoinbaseProExchange;
+import org.knowm.xchange.coinbasepro.dto.account.CoinbaseProWebsocketAuthData;
+import org.knowm.xchange.coinbasepro.service.CoinbaseProAccountServiceRaw;
 
 import info.bitrich.xchangestream.core.ProductSubscription;
 import info.bitrich.xchangestream.core.StreamingExchange;
 import info.bitrich.xchangestream.core.StreamingMarketDataService;
 import info.bitrich.xchangestream.service.netty.WebSocketClientHandler;
 import io.reactivex.Completable;
 import io.reactivex.Observable;
-import org.knowm.xchange.ExchangeSpecification;
-import org.knowm.xchange.gdax.GDAXExchange;
-import org.knowm.xchange.gdax.dto.account.GDAXWebsocketAuthData;
-import org.knowm.xchange.gdax.service.GDAXAccountServiceRaw;
 
 /**
- * GDAX Streaming Exchange. Connects to live WebSocket feed.
+ * CoinbasePro Streaming Exchange. Connects to live WebSocket feed.
  */
-public class GDAXStreamingExchange extends GDAXExchange implements StreamingExchange {
-    private static final String API_URI = "wss://ws-feed.gdax.com";
+public class CoinbaseProStreamingExchange extends CoinbaseProExchange implements StreamingExchange {
+    private static final String API_URI = "wss://ws-feed.pro.coinbase.com";
 
-    private GDAXStreamingService streamingService;
-    private GDAXStreamingMarketDataService streamingMarketDataService;
+    private CoinbaseProStreamingService streamingService;
+    private CoinbaseProStreamingMarketDataService streamingMarketDataService;
 
-    public GDAXStreamingExchange() { }
+    public CoinbaseProStreamingExchange() { }
 
     @Override
     protected void initServices() {
@@ -32,18 +33,18 @@ public Completable connect(ProductSubscription... args) {
         if (args == null || args.length == 0)
             throw new UnsupportedOperationException("The ProductSubscription must be defined!");
         ExchangeSpecification exchangeSpec = getExchangeSpecification();
-        this.streamingService = new GDAXStreamingService(API_URI, () -> authData(exchangeSpec));
-        this.streamingMarketDataService = new GDAXStreamingMarketDataService(this.streamingService);
+        this.streamingService = new CoinbaseProStreamingService(API_URI, () -> authData(exchangeSpec));
+        this.streamingMarketDataService = new CoinbaseProStreamingMarketDataService(streamingService);
         streamingService.subscribeMultipleCurrencyPairs(args);
 
         return streamingService.connect();
     }
 
-    private GDAXWebsocketAuthData authData(ExchangeSpecification exchangeSpec) {
-        GDAXWebsocketAuthData authData = null;
+    private CoinbaseProWebsocketAuthData authData(ExchangeSpecification exchangeSpec) {
+        CoinbaseProWebsocketAuthData authData = null;
         if ( exchangeSpec.getApiKey() != null ) {
             try {
-                GDAXAccountServiceRaw rawAccountService = (GDAXAccountServiceRaw) getAccountService();
+                CoinbaseProAccountServiceRaw rawAccountService = (CoinbaseProAccountServiceRaw) getAccountService();
                 authData = rawAccountService.getWebsocketAuthData();
             }
             catch (Exception e) {
@@ -56,7 +57,7 @@ private GDAXWebsocketAuthData authData(ExchangeSpecification exchangeSpec) {
 
     @Override
     public Completable disconnect() {
-        GDAXStreamingService service = this.streamingService;
+        CoinbaseProStreamingService service = streamingService;
         streamingService = null;
         streamingMarketDataService = null;
         return service.disconnect();