-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of https://github.com/knowm/XChange into develop
- Loading branch information
Showing
29 changed files
with
967 additions
and
239 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/dto/account/AmountType.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| package org.knowm.xchange.coinmate.dto.account; | ||
|
|
||
| public enum AmountType { | ||
| NET, | ||
| GROSS | ||
| } |
5 changes: 5 additions & 0 deletions
5
...e-coinmate/src/main/java/org/knowm/xchange/coinmate/dto/account/TransferHistoryOrder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| package org.knowm.xchange.coinmate.dto.account; | ||
|
|
||
| public enum TransferHistoryOrder { | ||
| ASC, DESC | ||
| } |
41 changes: 41 additions & 0 deletions
41
...ge-coinmate/src/main/java/org/knowm/xchange/coinmate/dto/account/UnconfirmedDeposits.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| package org.knowm.xchange.coinmate.dto.account; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import java.math.BigDecimal; | ||
|
|
||
| public class UnconfirmedDeposits { | ||
| private final Long id; | ||
|
|
||
| private final BigDecimal amount; | ||
|
|
||
| private final String address; | ||
|
|
||
| private final Long confirmations; | ||
|
|
||
| public UnconfirmedDeposits( | ||
| @JsonProperty Long id, | ||
| @JsonProperty BigDecimal amount, | ||
| @JsonProperty String address, | ||
| @JsonProperty Long confirmations) { | ||
| this.id = id; | ||
| this.amount = amount; | ||
| this.address = address; | ||
| this.confirmations = confirmations; | ||
| } | ||
|
|
||
| public Long getId() { | ||
| return id; | ||
| } | ||
|
|
||
| public BigDecimal getAmount() { | ||
| return amount; | ||
| } | ||
|
|
||
| public String getAddress() { | ||
| return address; | ||
| } | ||
|
|
||
| public Long getConfirmations() { | ||
| return confirmations; | ||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
...ate/src/main/java/org/knowm/xchange/coinmate/dto/account/UnconfirmedDepositsResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package org.knowm.xchange.coinmate.dto.account; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import java.util.ArrayList; | ||
| import org.knowm.xchange.coinmate.dto.CoinmateBaseResponse; | ||
|
|
||
| public class UnconfirmedDepositsResponse | ||
| extends CoinmateBaseResponse<ArrayList<UnconfirmedDeposits>> { | ||
| public UnconfirmedDepositsResponse( | ||
| @JsonProperty("error") boolean error, | ||
| @JsonProperty("errorMessage") String errorMessage, | ||
| @JsonProperty("data") ArrayList<UnconfirmedDeposits> data) { | ||
|
|
||
| super(error, errorMessage, data); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.