Skip to content

Commit

Permalink
Fix knowm#4268
Browse files Browse the repository at this point in the history 
Cursor for paginated /accounts results
  • Loading branch information
alfio committed Sep 26, 2021
1 parent b45e531 commit a9229f8
Show file tree
Hide file tree
Showing 2 changed files with 145 additions and 113 deletions.
4 changes: 3 additions & 1 deletion xchange-coinbase/src/main/java/org/knowm/xchange/coinbase/v2/CoinbaseAuthenticated.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,9 @@ CoinbaseAccountsData getAccounts(
@HeaderParam(CB_VERSION) String apiVersion,
@HeaderParam(CB_ACCESS_KEY) String apiKey,
@HeaderParam(CB_ACCESS_SIGN) ParamsDigest signature,
@HeaderParam(CB_ACCESS_TIMESTAMP) BigDecimal timestamp)
@HeaderParam(CB_ACCESS_TIMESTAMP) BigDecimal timestamp,
@QueryParam("limit") Integer limit,
@QueryParam("starting_after") String starting_after)
throws IOException, CoinbaseException;

@GET
Expand Down
254 changes: 142 additions & 112 deletions ...inbase/src/main/java/org/knowm/xchange/coinbase/v2/service/CoinbaseAccountServiceRaw.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@

import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.ObjectMapper;

import java.io.IOException;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import javax.ws.rs.core.MediaType;

import org.knowm.xchange.Exchange;
import org.knowm.xchange.coinbase.v2.Coinbase;
import org.knowm.xchange.coinbase.v2.dto.account.CoinbaseAccountData.CoinbaseAccount;
Expand All @@ -16,117 +20,143 @@

public class CoinbaseAccountServiceRaw extends CoinbaseBaseService {

public CoinbaseAccountServiceRaw(Exchange exchange) {
super(exchange);
}

public CoinbaseTransactionsResponse getTransactions(String accountId) throws IOException {
String apiKey = exchange.getExchangeSpecification().getApiKey();
BigDecimal timestamp = coinbase.getTime(Coinbase.CB_VERSION_VALUE).getData().getEpoch();

return coinbase.getTransactions(
Coinbase.CB_VERSION_VALUE, apiKey, signatureCreator2, timestamp, accountId);
}

public Map getDeposits(String accountId) throws IOException {
String apiKey = exchange.getExchangeSpecification().getApiKey();
BigDecimal timestamp = coinbase.getTime(Coinbase.CB_VERSION_VALUE).getData().getEpoch();

return coinbase.getDeposits(
Coinbase.CB_VERSION_VALUE, apiKey, signatureCreator2, timestamp, accountId);
}

public Map getWithdrawals(String accountId) throws IOException {
String apiKey = exchange.getExchangeSpecification().getApiKey();
BigDecimal timestamp = coinbase.getTime(Coinbase.CB_VERSION_VALUE).getData().getEpoch();

return coinbase.getWithdrawals(
Coinbase.CB_VERSION_VALUE, apiKey, signatureCreator2, timestamp, accountId);
}

/**
* Authenticated resource that shows the current user accounts.
*
* @see <a
* href="https://developers.coinbase.com/api/v2#list-accounts">developers.coinbase.com/api/v2#list-accounts</a>
*/
public List<CoinbaseAccount> getCoinbaseAccounts() throws IOException {
String apiKey = exchange.getExchangeSpecification().getApiKey();
BigDecimal timestamp = coinbase.getTime(Coinbase.CB_VERSION_VALUE).getData().getEpoch();

return coinbase
.getAccounts(Coinbase.CB_VERSION_VALUE, apiKey, signatureCreator2, timestamp)
.getData();
}

/**
* Authenticated resource that shows the current user account for the give currency.
*
* @see <a
* href="https://developers.coinbase.com/api/v2#show-an-account">developers.coinbase.com/api/v2#show-an-account</a>
*/
public CoinbaseAccount getCoinbaseAccount(Currency currency) throws IOException {
String apiKey = exchange.getExchangeSpecification().getApiKey();
BigDecimal timestamp = coinbase.getTime(Coinbase.CB_VERSION_VALUE).getData().getEpoch();

return coinbase
.getAccount(
Coinbase.CB_VERSION_VALUE,
apiKey,
signatureCreator2,
timestamp,
currency.getCurrencyCode())
.getData();
}

/**
* Authenticated resource that creates a new BTC account for the current user.
*
* @see <a
* href="https://developers.coinbase.com/api/v2#create-account">developers.coinbase.com/api/v2#create-account</a>
*/
public CoinbaseAccount createCoinbaseAccount(String name) throws IOException {

CreateCoinbaseAccountPayload payload = new CreateCoinbaseAccountPayload(name);

String path = "/v2/accounts";
String apiKey = exchange.getExchangeSpecification().getApiKey();
BigDecimal timestamp = coinbase.getTime(Coinbase.CB_VERSION_VALUE).getData().getEpoch();
String body = new ObjectMapper().writeValueAsString(payload);
String signature = getSignature(timestamp, HttpMethod.POST, path, body);
showCurl(HttpMethod.POST, apiKey, timestamp, signature, path, body);

return coinbase
.createAccount(
MediaType.APPLICATION_JSON,
Coinbase.CB_VERSION_VALUE,
apiKey,
signature,
timestamp,
payload)
.getData();
}

/**
* Authenticated resource that shows the current user payment methods.
*
* @see <a
* href="https://developers.coinbase.com/api/v2#list-payment-methods">developers.coinbase.com/api/v2?shell#list-payment-methods</a>
*/
public List<CoinbasePaymentMethod> getCoinbasePaymentMethods() throws IOException {
String apiKey = exchange.getExchangeSpecification().getApiKey();
BigDecimal timestamp = coinbase.getTime(Coinbase.CB_VERSION_VALUE).getData().getEpoch();

return coinbase
.getPaymentMethods(Coinbase.CB_VERSION_VALUE, apiKey, signatureCreator2, timestamp)
.getData();
}

public static class CreateCoinbaseAccountPayload {
@JsonProperty String name;

CreateCoinbaseAccountPayload(String name) {
this.name = name;
public CoinbaseAccountServiceRaw(Exchange exchange) {
super(exchange);
}

public CoinbaseTransactionsResponse getTransactions(String accountId) throws IOException {
String apiKey = exchange.getExchangeSpecification().getApiKey();
BigDecimal timestamp = coinbase.getTime(Coinbase.CB_VERSION_VALUE).getData().getEpoch();

return coinbase.getTransactions(
Coinbase.CB_VERSION_VALUE, apiKey, signatureCreator2, timestamp, accountId);
}

public Map getDeposits(String accountId) throws IOException {
String apiKey = exchange.getExchangeSpecification().getApiKey();
BigDecimal timestamp = coinbase.getTime(Coinbase.CB_VERSION_VALUE).getData().getEpoch();

return coinbase.getDeposits(
Coinbase.CB_VERSION_VALUE, apiKey, signatureCreator2, timestamp, accountId);
}

public Map getWithdrawals(String accountId) throws IOException {
String apiKey = exchange.getExchangeSpecification().getApiKey();
BigDecimal timestamp = coinbase.getTime(Coinbase.CB_VERSION_VALUE).getData().getEpoch();

return coinbase.getWithdrawals(
Coinbase.CB_VERSION_VALUE, apiKey, signatureCreator2, timestamp, accountId);
}

/**
* Authenticated resource that shows the current user accounts.
*
* @see <a
* href="https://developers.coinbase.com/api/v2#list-accounts">developers.coinbase.com/api/v2#list-accounts</a>
*/
public List<CoinbaseAccount> getCoinbaseAccounts() throws IOException {
String apiKey = exchange.getExchangeSpecification().getApiKey();

List<CoinbaseAccount> returnList = new ArrayList<>();
List<CoinbaseAccount> tmpList = null;

String lastAccount = null;
do {
BigDecimal timestamp = coinbase.getTime(Coinbase.CB_VERSION_VALUE).getData().getEpoch();

tmpList = coinbase
.getAccounts(Coinbase.CB_VERSION_VALUE, apiKey, signatureCreator2, timestamp, 100, lastAccount)
.getData();

lastAccount = null;
if (tmpList != null && tmpList.size() > 0) {
returnList.addAll(tmpList);
lastAccount = tmpList.get(tmpList.size() - 1).getId();
}

} while (lastAccount != null && isValidUUID(lastAccount));

return returnList;
}

private boolean isValidUUID(String uuid) {
try {
UUID.fromString(uuid);
return true;
} catch (IllegalArgumentException exception) {
return false;
}
}

/**
* Authenticated resource that shows the current user account for the give currency.
*
* @see <a
* href="https://developers.coinbase.com/api/v2#show-an-account">developers.coinbase.com/api/v2#show-an-account</a>
*/
public CoinbaseAccount getCoinbaseAccount(Currency currency) throws IOException {
String apiKey = exchange.getExchangeSpecification().getApiKey();
BigDecimal timestamp = coinbase.getTime(Coinbase.CB_VERSION_VALUE).getData().getEpoch();

return coinbase
.getAccount(
Coinbase.CB_VERSION_VALUE,
apiKey,
signatureCreator2,
timestamp,
currency.getCurrencyCode())
.getData();
}

/**
* Authenticated resource that creates a new BTC account for the current user.
*
* @see <a
* href="https://developers.coinbase.com/api/v2#create-account">developers.coinbase.com/api/v2#create-account</a>
*/
public CoinbaseAccount createCoinbaseAccount(String name) throws IOException {

CreateCoinbaseAccountPayload payload = new CreateCoinbaseAccountPayload(name);

String path = "/v2/accounts";
String apiKey = exchange.getExchangeSpecification().getApiKey();
BigDecimal timestamp = coinbase.getTime(Coinbase.CB_VERSION_VALUE).getData().getEpoch();
String body = new ObjectMapper().writeValueAsString(payload);
String signature = getSignature(timestamp, HttpMethod.POST, path, body);
showCurl(HttpMethod.POST, apiKey, timestamp, signature, path, body);

return coinbase
.createAccount(
MediaType.APPLICATION_JSON,
Coinbase.CB_VERSION_VALUE,
apiKey,
signature,
timestamp,
payload)
.getData();
}

/**
* Authenticated resource that shows the current user payment methods.
*
* @see <a
* href="https://developers.coinbase.com/api/v2#list-payment-methods">developers.coinbase.com/api/v2?shell#list-payment-methods</a>
*/
public List<CoinbasePaymentMethod> getCoinbasePaymentMethods() throws IOException {
String apiKey = exchange.getExchangeSpecification().getApiKey();
BigDecimal timestamp = coinbase.getTime(Coinbase.CB_VERSION_VALUE).getData().getEpoch();

return coinbase
.getPaymentMethods(Coinbase.CB_VERSION_VALUE, apiKey, signatureCreator2, timestamp)
.getData();
}

public static class CreateCoinbaseAccountPayload {
@JsonProperty
String name;

CreateCoinbaseAccountPayload(String name) {
this.name = name;
}
}
}
}

0 comments on commit a9229f8

Please sign in to comment.