june update

Author: Insmael

README.md

@@ -32,49 +32,61 @@ String apiSecret = "21b12401";
 CryptomarketRestClient client = new CryptomarketRestClientImpl(apiKey, apiSecret);
 
 // get all currencies
-Map<String, Currency> currencies = client.getCurrencies(null);
+Map<String, Currency> currencies = client.getCurrencies(null, null);
 
 // get some symbols
-List<String> symbolIDs = new ArrayList<String>(Arrays.asList("eoseth","ethbtc"));
+List<String> symbolIDs = new ArrayList<String>(Arrays.asList("EOSETH","ETHBTC"));
 Map<String, Symbol> symbols = client.getSymbols(symbolIDs);
 
 // get an order book
-OrderBook  orderbook = client.getOrderbookOfSymbol("eoseth");
+OrderBook  orderbook = client.getOrderbookBySymbol("EOSETH");
 
 // get some candles
-List<String> symbols = new ArrayList<String>(Arrays.asList("eoseth", "ethbtc"));
+List<String> symbols = new ArrayList<String>(Arrays.asList("EOSETH", "ETHBTC"));
 Map<String, List<Candle>> candles = client.getCandles(symbols, Period._4_HOURS, Sort.ASC, null, null, null);
 
-// get your account balances
-List<Balance> balances = client.getAccountBalance();
+// get your wallet balances
+List<Balance> walletBalances = client.getWalletBalances();
 
-// get your trading balances
-List<Balance> balances = client.getTradingBalance();
+// get your spot trading balances
+List<Balance> spotBalances = client.getSpotTradingBalances();
 
 // move balance from account to trading
-String result = client.transferBetweenTradingAndAccountBalance('eth', '3.2', TransferType.BANK_TO_EXCHANGE);
+String result = client.transferBetweenWalletAndExchange(
+  'ETH', 
+  '3.2', 
+  AccountType.WALLET,
+  AccountType.SPOT);
 
 // get your active orders
-List<Order> orders = client.getActiveOrders('eoseth');
-
+List<Order> orders = client.getAllActiveSpotOrders('ESOETH');
 
 // create a new order
 Order order = client.createOrder(new ParamsBuilder()
             .symbol("EOSETH")
             .side(Side.SELL)
             .quantity("2")
-            .price("100000")
+            .price("10000")
             .timeInForce(TimeInForce.DAY));
 ```
 
 ## Using the ParamsBuilder
 
-most client methods have a version that accepts a ParamBuilder. This class makes easier to pass parameters.
+most client methods have a version that accepts a ParamBuilder. This class makes easier to pass parameters, and is expected to recieve the same parameters as the parameterized version.
 
 ```java
 import com.cryptomarket.params.ParamsBuilder;
 
+List<String> symbols = new ArrayList<String>(Arrays.asList("EOSETH", "ETHBTC"));
 // get candles
+Map<String, List<Candle>> candles = client.getCandles(
+  symbols, 
+  Period._4_HOURS, 
+  Sort.ASC, 
+  null, 
+  null, 
+  null);
+// is equivalent to:
 Map<String, List<Candle>> candles client.getCandles(new ParamsBuilder()
           .symbols(symbols)
           .period(Period._4_HOURS)
@@ -105,13 +117,17 @@ There are three websocket clients, the market data client, the spot trading clie
 The market data client requires no authentication, while the spot trading client and the wallet client do require it.
 
 All websocket methods accept a `BiConsumer` with the first argument being the resulting data of the request, and the second
-argument a possible exception of type `CryptomarketSDKException`. If there is an exception the data is null: `(null, exception) -> {...}`.nd if
-there is no exception, the exception argument is null: `(data,null) -> {...}`
+argument a possible exception of type `CryptomarketSDKException`. If there is an exception the data is null: `(null, exception) -> {...}`. And if there is no exception, the exception argument is null: `(data,null) -> {...}`
 
 websocket subscriptions take a second `BiConsumer` that takes the subscription data as the first argument, and the notification type as the second. The notification type is of type NotificationType, and is either SNAPSHOT, NOTIFICATION or DATA. there are functions to test the type of notification:
 
+If there is an error in a notification of a subscription, a special notification type is used, to check it call `notificationType.isError()`, in such case, the data is null. This holds for all subscriptions
+
 ```java
 BiConsumer<List<Report>, NotificationType> biConsumerExample = (data, notificationType) -> {
+  if (notificationType.isError()) {
+    System.out.println("an error ocurred");
+  }
   if (notificationType.isSnapshot()) {
     System.out.println("is a snapshot notification");
   }
@@ -124,9 +140,23 @@ BiConsumer<List<Report>, NotificationType> biConsumerExample = (data, notificati
 }
 ```
 
-The documentation of a specific subscriptions explains with of this types of
+The documentation of a specific subscription explains which types of
 notification uses.
 
+### Websocket Lifetime
+There are hooks for the connection, close and faiule of the websockets. 
+
+On an authenticated client, onConnect is called after authentication, which happens automatically after connection.
+```java
+// ws client lifetime
+CryptomarketWSSpotTradingClient wsClient;
+    wsClient = new CryptomarketWSSpotTradingClientImpl(KeyLoader.getApiKey(), KeyLoader.getApiSecret());
+    wsClient.onConnect(() -> System.out.println("connecting"));
+    wsClient.onClose(reason -> System.out.println("closing: "+ reason));
+    wsClient.onFailure(t -> t.printStackTrace());
+    wsClient.connect();
+```
+
 ### MarketDataClient
 
 Example of use of the market data client

src/main/java/com/cryptomarket/params/ArgNames.java

@@ -51,7 +51,7 @@ public class ArgNames {
   public static final String VOLUME = "volume";
   public static final String FROM_CURRENCY = "from_currency";
   public static final String TO_CURRENCY = "to_currency";
-  public static final String TRANSFER_BY = "by";
+  public static final String IDENTIFY_BY = "by";
   public static final String IDENTIFIER = "identifier";
   public static final String ORDER_ID = "order_id";
   public static final String ORDER_LIST_ID = "order_list_id";
@@ -65,4 +65,12 @@ public class ArgNames {
   public static final String DESCRIPTION = "description";
   public static final String SUB_ACCOUNT_ID = "sub_account_id";
   public static final String TRANSFER_TYPE = "type";
+  public static final String SUBSCRIPTION_MODE = "mode";
+  public static final String NETWORK_CODE = "network_code";
+  public static final String TARGET_CURRENCY = "target_currency";
+  public static final String PREFERRED_NETWORK = "preferred_network";
+  public static final String DEPTH = "depth";
+  public static final String NETWORKS = "networks";
+  public static final String EMAIL = "email";
+  public static final String STATUS = "status";
 }

src/main/java/com/cryptomarket/params/ContingencyType.java

@@ -1,9 +1,15 @@
 package com.cryptomarket.params;
 
+import com.squareup.moshi.Json;
+
 public enum ContingencyType {
+  @Json(name = "allOrNone")
   ALL_OR_NONE("allOrNone"),
+  @Json(name = "oneCancelOther")
   ONE_CANCEL_OTHER("oneCancelOther"),
+  @Json(name = "oneTriggerOther")
   ONE_TRIGGER_OTHER("oneTriggerOther"),
+  @Json(name = "oneTriggerOneCancelOther")
   ONE_TRIGGER_ONE_CANCEL_OTHER("oneTriggerOneCancelOther");
 
   private final String label;

src/main/java/com/cryptomarket/params/NotificationType.java

@@ -3,7 +3,8 @@
 public enum NotificationType {
   SNAPSHOT("snapshot"),
   UPDATE("update"),
-  DATA("data");
+  DATA("data"),
+  PARSE_ERROR("error");
 
   private final String label;
 
@@ -27,4 +28,8 @@ public boolean isData() {
     return this == NotificationType.DATA;
   }
 
+  public boolean isError() {
+    return this == NotificationType.PARSE_ERROR;
+  }
+
 }

src/main/java/com/cryptomarket/params/OrderBuilder.java

@@ -1,87 +1,99 @@
 package com.cryptomarket.params;
 
-import java.util.List;
-import java.util.Map;
-
-import com.cryptomarket.sdk.exceptions.CryptomarketArgumentException;
+import com.squareup.moshi.Json;
 
 public class OrderBuilder {
-  ParamsBuilder paramsBuilder = new ParamsBuilder();
+  @Json(name = "client_order_id")
+  private String clientOrderId;
+  private String symbol;
+  private Side side;
+  private OrderType type;
 
-  public OrderBuilder checkRequired(List<String> requiredParams) throws CryptomarketArgumentException {
-    paramsBuilder.checkRequired(requiredParams);
-    return this;
-  }
-  public OrderBuilder clientOrderID(String clientOrderID) {
-    paramsBuilder.clientOrderID(clientOrderID);
+  @Json(name = "time_in_force")
+  private TimeInForce timeInForce;
+  private String quantity;
+  private String price;
+
+  @Json(name = "stop_price")
+  private String stopPrice;
+
+  @Json(name = "expire_time")
+  private String expireTime;
+
+  @Json(name = "strict_validate")
+  private Boolean strictValidate;
+
+  @Json(name = "post_only")
+  private Boolean postOnly;
+
+  @Json(name = "take_rate")
+  private String takeRate;
+
+  @Json(name = "make_rate")
+  private String makeRate;
+
+  public OrderBuilder clientOrderId(String clientOrderId) {
+    this.clientOrderId = clientOrderId;
     return this;
   }
 
   public OrderBuilder symbol(String symbol) {
-    paramsBuilder.symbol(symbol);
+    this.symbol = symbol;
     return this;
   }
 
   public OrderBuilder side(Side side) {
-    paramsBuilder.side(side);
+    this.side = side;
     return this;
   }
 
-  public OrderBuilder orderType(OrderType orderType) {
-    paramsBuilder.orderType(orderType);
+  public OrderBuilder orderType(OrderType type) {
+    this.type = type;
     return this;
   }
 
   public OrderBuilder timeInForce(TimeInForce timeInForce) {
-    paramsBuilder.timeInForce(timeInForce);
+    this.timeInForce = timeInForce;
     return this;
   }
 
-  public OrderBuilder quantity(String quantity) {
-    paramsBuilder.quantity(quantity);
+  public OrderBuilder quantity(String quanity) {
+    this.quantity = quanity;
     return this;
   }
 
   public OrderBuilder price(String price) {
-    paramsBuilder.price(price);
+    this.price = price;
     return this;
   }
 
-  public OrderBuilder stopPrice(String stpoPrice) {
-    paramsBuilder.stopPrice(stpoPrice);
+  public OrderBuilder stopPrice(String stopPrice) {
+    this.stopPrice = stopPrice;
     return this;
   }
 
   public OrderBuilder expireTime(String expireTime) {
-    paramsBuilder.expireTime(expireTime);
+    this.expireTime = expireTime;
     return this;
   }
 
   public OrderBuilder strictValidate(Boolean strictValidate) {
-    paramsBuilder.strictValidate(strictValidate);
+    this.strictValidate = strictValidate;
     return this;
   }
 
   public OrderBuilder postOnly(Boolean postOnly) {
-    paramsBuilder.postOnly(postOnly);
+    this.postOnly = postOnly;
     return this;
   }
 
   public OrderBuilder takeRate(String takeRate) {
-    paramsBuilder.takeRate(takeRate);
+    this.takeRate = takeRate;
     return this;
   }
 
   public OrderBuilder makeRate(String makeRate) {
-    paramsBuilder.makeRate(makeRate);
+    this.makeRate = makeRate;
     return this;
   }
-
-  public Map<String, Object> buildObjectMap() {
-    return paramsBuilder.buildObjectMap();
-  }
-
-  public Map<String, String> build() {
-    return paramsBuilder.build();
-  }
 }