Merge pull request #17 from cryptomkt/fix/transaction-history-order-by

Fix/transaction history order by

Author: ppbustamante

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

@@ -7,7 +7,9 @@ public enum OrderBy {
   /** sort by id */
   ID("id"),
   /** sort by update date */
-  UPDATE_AT("updated_at");
+  UPDATE_AT("updated_at"),
+  /** sort by last activity */
+  LAST_ACTIVITY_AT("last_activity_at");
 
   private final String label;
 

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

@@ -140,6 +140,17 @@ private ParamsBuilder addArg(String key, @Nullable Enum<?> arg) {
     return this;
   }
 
+  /**
+   * Adds an arbitrary parameter
+   *
+   * @param key   the name of the parameter
+   * @param value the value of the parameter
+   * @return The ParamsBuilder
+   */
+  public ParamsBuilder parameter(String key, String value) {
+    return addArg(key, value);
+  }
+
   /**
    * Adds a currencies param to the ParamBuilder.
    *
@@ -230,7 +241,6 @@ public ParamsBuilder by(@Nullable SortBy by) {
     return addArg(ArgNames.BY, by);
   }
 
-
   /**
    * Adds an order_by param to the ParamBuilder.
    *
@@ -903,4 +913,14 @@ public ParamsBuilder symbolList(List<String> symbols) {
   public ParamsBuilder currencyListOrAsterisc(@Nullable List<String> currencies) {
     return addListOrAsterisc(ArgNames.CURRENCIES, currencies);
   }
+
+  /**
+   * Adds a group_transaction param to the ParamBuilder.
+   *
+   * @param status A SubAccountStatus type
+   * @return The ParamsBuilder
+   */
+  public ParamsBuilder GroupTransactions(Boolean asGroupTransactions) {
+    return addArg(ArgNames.GROUP_TRANSACTIONS, asGroupTransactions);
+  }
 }

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

@@ -147,4 +147,6 @@ public class ArgNames {
   public static final String EMAIL = "email";
   /** */
   public static final String STATUS = "status";
+  /** */
+  public static final String GROUP_TRANSACTIONS = "group_transactions";
 }

src/main/java/com/cryptomarket/sdk/HMAC.java

@@ -29,6 +29,14 @@ public Integer getWindow() {
     return window;
   }
 
+  public String getApiSecret() {
+    return apiSecret;
+  }
+
+  public String getApiKey() {
+    return apiKey;
+  }
+
   public String getCredential(String method, String body, String url) {
     String timestamp = String.format("%d", System.currentTimeMillis());
     String message = new StringBuffer()

src/main/java/com/cryptomarket/sdk/models/CommitRisk.java

@@ -0,0 +1,77 @@
+package com.cryptomarket.sdk.models;
+
+import com.squareup.moshi.Json;
+
+public class CommitRisk {
+  private Integer score;
+  private String rbf;
+  @Json(name = "low_fee")
+  private String lowFee;
+
+  /**
+   * Gets the risk score of the associated transaction. For more information see
+   * the
+   * api docs at
+   * https://api.exchange.cryptomkt.com/#get-transactions-history.
+   *
+   * @return
+   */
+  public Integer getScore() {
+    return score;
+  }
+
+  /**
+   * Sets the risk score of the associated transaction
+   *
+   * @param score
+   */
+  public void setScore(Integer score) {
+    this.score = score;
+  }
+
+  /**
+   * Gets a flag indicating if the associated transaction can be replaced by an
+   * aditional fee (replace-by-fee). For more information see the api docs at
+   * https://api.exchange.cryptomkt.com/#get-transactions-history.
+   *
+   * @return
+   */
+  public String getRbf() {
+    return rbf;
+  }
+
+  /**
+   * Sets the replace-by-fee flag of the associated transaction
+   *
+   * @param rbf
+   */
+  public void setRbf(String rbf) {
+    this.rbf = rbf;
+  }
+
+  /**
+   * Gets a flag indicating whether the actual network fee is lower than the
+   * estimated one.
+   * For more information see the api docs at.
+   * https://api.exchange.cryptomkt.com/#get-transactions-history
+   *
+   * @return
+   */
+  public String getLowFee() {
+    return lowFee;
+  }
+
+  /**
+   * Sets the low fee flag
+   *
+   * @param lowFee
+   */
+  public void setLowFee(String lowFee) {
+    this.lowFee = lowFee;
+  }
+
+  @Override
+  public String toString() {
+    return "CommitRisk [source=" + score + ", rbg=" + rbf + ", lowFee=" + lowFee + "]";
+  }
+}

src/main/java/com/cryptomarket/sdk/models/FeeRequest.java

@@ -8,6 +8,11 @@ public class FeeRequest {
   @Json(name = "network_code")
   private String networkCode;
 
+  public FeeRequest(String currency, String amount) {
+    this.currency = currency;
+    this.amount = amount;
+  }
+
   public FeeRequest(String currency, String amount, String networkCode) {
     this.currency = currency;
     this.amount = amount;

src/main/java/com/cryptomarket/sdk/models/Network.java

@@ -1,5 +1,7 @@
 package com.cryptomarket.sdk.models;
 
+import java.util.Map;
+
 import com.squareup.moshi.Json;
 
 /**
@@ -8,8 +10,6 @@
 public class Network {
   private String code;
   private String network;
-  @Json(name = "is_ens_available")
-  private Boolean ensAvailable;
   private String protocol;
   @Json(name = "default")
   private Boolean defaultNetwork;
@@ -41,6 +41,16 @@ public class Network {
   private String cryptoPaymentIdName;
   @Json(name = "crypto_explorer")
   private String cryptoExplorer;
+  @Json(name = "network_name")
+  private String networkName;
+  @Json(name = "is_ens_available")
+  private Boolean ensAvailable;
+  @Json(name = "contract_address")
+  private String contractAddress;
+  @Json(name = "is_multichain")
+  private Boolean multichain;
+  @Json(name = "asset_id")
+  private Map<String, String> assetId;
 
   /**
    * Gets the network code
@@ -378,6 +388,76 @@ public void setCryptoExplorer(String cryptoExplorer) {
     this.cryptoExplorer = cryptoExplorer;
   }
 
+  /**
+   * Gets the full network name of the network
+   *
+   * @return
+   */
+  public String getNetworkName() {
+    return networkName;
+  }
+
+  /**
+   * Sets the network name
+   *
+   * @param networkName
+   */
+  public void setNetworkName(String networkName) {
+    this.networkName = networkName;
+  }
+
+  /**
+   * Gets the contract address of the network
+   *
+   * @return
+   */
+  public String getContractAddress() {
+    return contractAddress;
+  }
+
+  /**
+   * Sets the contract address of the network
+   *
+   * @param contractAddress
+   */
+  public void setContractAddress(String contractAddress) {
+    this.contractAddress = contractAddress;
+  }
+
+  /**
+   * Get a flag indicating if the multichain is active for the network
+   *
+   * @return
+   */
+  public Boolean getMultichain() {
+    return multichain;
+  }
+
+  /**
+   * Sets the multichain flag of the network
+   *
+   * @param multichain
+   */
+  public void setMultichain(Boolean multichain) {
+    this.multichain = multichain;
+  }
+
+  /**
+   * Gets arbitrary data particular of the network
+   * @return
+   */
+  public Map<String, String> getAssetId() {
+    return assetId;
+  }
+
+  /**
+   * Sets the asset id, extra data of the network
+   * @param assetId
+   */
+  public void setAssetId(Map<String, String> assetId) {
+    this.assetId = assetId;
+  }
+
   @Override
   public String toString() {
     return "Network [code=" + code + ", network=" + network + ", ensAvailable=" + ensAvailable + ", protocol="

src/main/java/com/cryptomarket/sdk/models/Transaction.java

@@ -17,10 +17,14 @@ public class Transaction {
   private String createdAt;
   @Json(name = "updated_at")
   private String updatedAt;
+  @Json(name = "last_activity_at")
+  private String lastActivityAt;
   @Json(name = "native")
   private NativeTransaction nativeTransaction;
   @Json(name = "network_code")
   private String networkCode;
+  @Json(name = "commit_risk")
+  private CommitRisk commitRisk;
 
   /**
    * Gets the transaction id
@@ -130,6 +134,24 @@ public void setUpdatedAt(String updatedAt) {
     this.updatedAt = updatedAt;
   }
 
+  /**
+   * Gets the last activity of the transaction
+   *
+   * @return
+   */
+  public String getLastActivityAt() {
+    return lastActivityAt;
+  }
+
+  /**
+   * Sets the last activity of the transaction
+   *
+   * @param lastActivityAt
+   */
+  public void setLastActivityAt(String lastActivityAt) {
+    this.lastActivityAt = lastActivityAt;
+  }
+
   /**
    * Gets the native transaction
    *
@@ -166,10 +188,27 @@ public void setNetworkCode(String networkCode) {
     this.networkCode = networkCode;
   }
 
+  /**
+   * Gets the commit risk of the transaction
+   * @return
+   */
+  public CommitRisk getCommitRisk() {
+    return commitRisk;
+  }
+
+  /**
+   * Sets the commit rist of the transaction
+   *
+   * @param commitRisk
+   */
+  public void setCommitRisk(CommitRisk commitRisk) {
+    this.commitRisk = commitRisk;
+  }
+
   @Override
   public String toString() {
     return "Transaction [id=" + id + ", status=" + status + ", type=" + type + ", subtype=" + subtype + ", createdAt="
-        + createdAt + ", updatedAt=" + updatedAt + ", nativeTransaction=" + nativeTransaction + ", networkCode="
-        + networkCode + "]";
+        + createdAt + ", updatedAt=" + updatedAt + ", lastActivityAt=" + lastActivityAt + ", nativeTransaction="
+        + nativeTransaction + ", networkCode=" + networkCode + ", commitRisk=" + commitRisk + "]";
   }
 }

src/main/java/com/cryptomarket/sdk/rest/CloseableHttpClient.java

@@ -11,11 +11,19 @@ public interface CloseableHttpClient extends Closeable {
 
   /**
    * Changes the user credentials used for authentication in calls
-   * @param apiKey the user public key used in new calls
+   *
+   * @param apiKey    the user public key used in new calls
    * @param apiSecret the user secret key used in new calls
    */
   public void changeCredentials(String apiKey, String apiSecret);
 
+  /**
+   * Changes the window used in authenticated calls
+   *
+   * @param window acceptable time between request and server execution
+   */
+  public void changeWindow(Integer window);
+
   /**
    * Does an http get without authentication
    *