[coinbase-pro] Updating/Adding support for some AccountService and TradeService endpoints.

pom.xml

@@ -211,6 +211,7 @@
     <module>xchange-stream-service-pubnub</module>
     <module>xchange-stream-coincheck</module>
     <module>xchange-stream-krakenfutures</module>
+    <module>xchange-stream-bybit</module>
   </modules>
 
   <ciManagement>

xchange-bibox/src/main/java/org/knowm/xchange/bibox/dto/BiboxAdapters.java

@@ -172,33 +172,25 @@ public static Date convert(String s) {
   }
 
   public static FundingRecord adaptDeposit(BiboxDeposit d) {
-    return new FundingRecord(
-        d.to,
-        d.getCreatedAt(),
-        Currency.getInstance(d.coinSymbol),
-        d.amount,
-        null,
-        null,
-        Type.DEPOSIT,
-        convertStatus(d.status),
-        null,
-        null,
-        null);
+    return FundingRecord.builder()
+        .address(d.to)
+        .date(d.getCreatedAt())
+        .currency(Currency.getInstance(d.coinSymbol))
+        .amount(d.amount)
+        .type(Type.DEPOSIT)
+        .status(convertStatus(d.status))
+        .build();
   }
 
   public static FundingRecord adaptDeposit(BiboxWithdrawal w) {
-    return new FundingRecord(
-        w.toAddress,
-        w.getCreatedAt(),
-        Currency.getInstance(w.coinSymbol),
-        w.amountReal,
-        null,
-        null,
-        Type.WITHDRAWAL,
-        convertStatus(w.status),
-        null,
-        null,
-        null);
+    return FundingRecord.builder()
+        .address(w.toAddress)
+        .date(w.getCreatedAt())
+        .currency(Currency.getInstance(w.coinSymbol))
+        .amount(w.amountReal)
+        .type(Type.WITHDRAWAL)
+        .status(convertStatus(w.status))
+        .build();
   }
 
   public static Status convertStatus(int status) {

xchange-binance/src/main/java/org/knowm/xchange/binance/service/BinanceAccountService.java

@@ -288,57 +288,49 @@ public List<FundingRecord> getFundingHistory(TradeHistoryParams params) throws I
         super.withdrawHistory(asset, startTime, endTime)
             .forEach(
                 w -> result.add(
-                    new FundingRecord(
-                        w.getAddress(),
-                        w.getAddressTag(),
-                        BinanceAdapters.toDate(w.getApplyTime()),
-                        Currency.getInstance(w.getCoin()),
-                        w.getAmount(),
-                        w.getId(),
-                        w.getTxId(),
-                        Type.WITHDRAWAL,
-                        withdrawStatus(w.getStatus()),
-                        null,
-                        w.getTransactionFee(),
-                        null)));
+                    FundingRecord.builder()
+                        .address(w.getAddress())
+                        .addressTag(w.getAddressTag())
+                        .date(BinanceAdapters.toDate(w.getApplyTime()))
+                        .currency(Currency.getInstance(w.getCoin()))
+                        .amount(w.getAmount())
+                        .internalId(w.getId())
+                        .blockchainTransactionHash(w.getTxId())
+                        .type(Type.WITHDRAWAL)
+                        .status(withdrawStatus(w.getStatus()))
+                        .fee(w.getTransactionFee())
+                        .build()));
       }
 
       if (deposits) {
         super.depositHistory(asset, startTime, endTime)
             .forEach(
                 d -> result.add(
-                    new FundingRecord(
-                        d.getAddress(),
-                        d.getAddressTag(),
-                        new Date(d.getInsertTime()),
-                        Currency.getInstance(d.getCoin()),
-                        d.getAmount(),
-                        null,
-                        d.getTxId(),
-                        Type.DEPOSIT,
-                        depositStatus(d.getStatus()),
-                        null,
-                        null,
-                        null)));
+                    FundingRecord.builder()
+                        .address(d.getAddress())
+                        .addressTag(d.getAddressTag())
+                        .date(new Date(d.getInsertTime()))
+                        .currency(Currency.getInstance(d.getCoin()))
+                        .amount(d.getAmount())
+                        .blockchainTransactionHash(d.getTxId())
+                        .type(Type.DEPOSIT)
+                        .status(depositStatus(d.getStatus()))
+                        .build()));
       }
 
       if (otherInflow) {
         super.getAssetDividend(asset, startTime, endTime)
             .forEach(
                 a -> result.add(
-                    new FundingRecord(
-                        null,
-                        null,
-                        new Date(a.getDivTime()),
-                        Currency.getInstance(a.getAsset()),
-                        a.getAmount(),
-                        null,
-                        String.valueOf(a.getTranId()),
-                        Type.OTHER_INFLOW,
-                        Status.COMPLETE,
-                        null,
-                        null,
-                        a.getEnInfo())));
+                    FundingRecord.builder()
+                        .date(new Date(a.getDivTime()))
+                        .currency(Currency.getInstance(a.getAsset()))
+                        .amount(a.getAmount())
+                        .blockchainTransactionHash(String.valueOf(a.getTranId()))
+                        .type(Type.OTHER_INFLOW)
+                        .status(Status.COMPLETE)
+                        .description(a.getEnInfo())
+                        .build()));
       }
 
       final String finalEmail = email;
@@ -347,13 +339,13 @@ public List<FundingRecord> getFundingHistory(TradeHistoryParams params) throws I
         super.getTransferHistory(email, startTime, endTime, page, limit)
             .forEach(
                 a -> result.add(
-                    new FundingRecord.Builder()
-                        .setAddress(finalEmail)
-                        .setDate(new Date(a.getTime()))
-                        .setCurrency(Currency.getInstance(a.getAsset()))
-                        .setAmount(a.getQty())
-                        .setType(Type.INTERNAL_WITHDRAWAL)
-                        .setStatus(transferHistoryStatus(a.getStatus()))
+                    FundingRecord.builder()
+                        .address(finalEmail)
+                        .date(new Date(a.getTime()))
+                        .currency(Currency.getInstance(a.getAsset()))
+                        .amount(a.getQty())
+                        .type(Type.INTERNAL_WITHDRAWAL)
+                        .status(transferHistoryStatus(a.getStatus()))
                         .build()));
       }
 
@@ -363,16 +355,16 @@ public List<FundingRecord> getFundingHistory(TradeHistoryParams params) throws I
         super.getSubUserHistory(asset, type, startTime, endTime, limit)
             .forEach(
                 a -> result.add(
-                    new FundingRecord.Builder()
-                        .setAddress(a.getEmail())
-                        .setDate(new Date(a.getTime()))
-                        .setCurrency(Currency.getInstance(a.getAsset()))
-                        .setAmount(a.getQty())
-                        .setType(
+                    FundingRecord.builder()
+                        .address(a.getEmail())
+                        .date(new Date(a.getTime()))
+                        .currency(Currency.getInstance(a.getAsset()))
+                        .amount(a.getQty())
+                        .type(
                             a.getType().equals(1)
                                 ? Type.INTERNAL_DEPOSIT
                                 : Type.INTERNAL_WITHDRAWAL)
-                        .setStatus(Status.COMPLETE)
+                        .status(Status.COMPLETE)
                         .build()));
       }
 

xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/service/BitbayAccountServiceRaw.java

@@ -5,6 +5,7 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
@@ -13,6 +14,7 @@
 import org.knowm.xchange.bitbay.dto.acount.BitbayAccountInfoResponse;
 import org.knowm.xchange.currency.Currency;
 import org.knowm.xchange.dto.account.FundingRecord;
+import org.knowm.xchange.dto.account.FundingRecord.Status;
 import org.knowm.xchange.exceptions.ExchangeException;
 
 /** @author Z. Dolezal */
@@ -103,18 +105,15 @@ else if (map.get("operation_type").toString().equals("-transfer"))
         else continue;
 
         res.add(
-            new FundingRecord(
-                null,
-                dateFormat.parse(map.get("time").toString()),
-                Currency.getInstance(map.get("currency").toString()),
-                new BigDecimal(map.get("amount").toString()),
-                map.get("id").toString(),
-                null,
-                type,
-                FundingRecord.Status.COMPLETE,
-                null,
-                null,
-                map.get("comment").toString()));
+            FundingRecord.builder()
+                .date(dateFormat.parse(map.get("time").toString()))
+                .currency(Currency.getInstance(map.get("currency").toString()))
+                .amount(new BigDecimal(map.get("amount").toString()))
+                .internalId(map.get("id").toString())
+                .type(type)
+                .status(Status.COMPLETE)
+                .description(map.get("comment").toString())
+                .build());
       } catch (ParseException e) {
         throw new IllegalStateException("Should not happen", e);
       }

xchange-bitbay/src/main/java/org/knowm/xchange/bitbay/v3/service/BitbayAccountService.java

@@ -86,17 +86,17 @@ private static FundingRecord adaptFundingRecord(BitbayBalanceHistoryEntry item)
             ? FundingRecord.Type.WITHDRAWAL
             : FundingRecord.Type.DEPOSIT;
 
-    return new FundingRecord.Builder()
-        .setType(type)
-        .setBlockchainTransactionHash(null) // not available in the API yet
-        .setAddress(null) // not available in the API yet
-        .setAmount(item.getValue().abs())
-        .setCurrency(Currency.getInstance(item.getBalance().getCurrency()))
-        .setDate(DateUtils.fromMillisUtc(item.getTime()))
-        .setInternalId(item.getHistoryId().toString())
-        .setFee(null) // not available in the API yet
-        .setStatus(FundingRecord.Status.COMPLETE)
-        .setBalance(item.getFundsAfter().getTotal())
+    return FundingRecord.builder()
+        .type(type)
+        .blockchainTransactionHash(null) // not available in the API yet
+        .address(null) // not available in the API yet
+        .amount(item.getValue().abs())
+        .currency(Currency.getInstance(item.getBalance().getCurrency()))
+        .date(DateUtils.fromMillisUtc(item.getTime()))
+        .internalId(item.getHistoryId().toString())
+        .fee(null) // not available in the API yet
+        .status(FundingRecord.Status.COMPLETE)
+        .balance(item.getFundsAfter().getTotal())
         .build();
   }
 }

xchange-bitcoinde/src/main/java/org/knowm/xchange/bitcoinde/v4/BitcoindeAdapters.java

@@ -284,29 +284,29 @@ public static List<FundingRecord> adaptFundingHistory(
             ledger -> {
               FundingRecord.Type type = adaptFundingRecordType(ledger.getType());
 
-              FundingRecord.Builder builder =
-                  new FundingRecord.Builder()
-                      .setType(type)
-                      .setDate(ledger.getDate())
-                      .setCurrency(currency)
-                      .setAmount(ledger.getCashflow().abs())
-                      .setBalance(ledger.getBalance())
-                      .setStatus(FundingRecord.Status.COMPLETE)
-                      .setDescription(ledger.getType().getValue());
+              FundingRecord.FundingRecordBuilder builder =
+                  FundingRecord.builder()
+                      .type(type)
+                      .date(ledger.getDate())
+                      .currency(currency)
+                      .amount(ledger.getCashflow().abs())
+                      .balance(ledger.getBalance())
+                      .status(FundingRecord.Status.COMPLETE)
+                      .description(ledger.getType().getValue());
 
               if (INPAYMENT == ledger.getType() || PAYOUT == ledger.getType()) {
-                builder.setBlockchainTransactionHash(ledger.getReference());
+                builder.blockchainTransactionHash(ledger.getReference());
               } else {
-                builder.setInternalId(ledger.getReference());
+                builder.internalId(ledger.getReference());
               }
 
               if (!leaveFeesSeperate && PAYOUT == ledger.getType()) {
                 Optional<BitcoindeAccountLedger> feeLedger =
                     findFeeLedger(ledger.getReference(), feeLedgers);
                 if (feeLedger.isPresent()) {
                   BigDecimal fee = feeLedger.get().getCashflow().abs();
-                  builder.setAmount(ledger.getCashflow().abs().add(fee));
-                  builder.setFee(fee);
+                  builder.amount(ledger.getCashflow().abs().add(fee));
+                  builder.fee(fee);
 
                   /*
                    * There can be multiple {@code PAYOUTS}s with the same reference/ blockchain

xchange-bitfinex/src/main/java/org/knowm/xchange/bitfinex/service/BitfinexAdapters.java

@@ -48,6 +48,8 @@
 import org.knowm.xchange.dto.account.Balance;
 import org.knowm.xchange.dto.account.Fee;
 import org.knowm.xchange.dto.account.FundingRecord;
+import org.knowm.xchange.dto.account.FundingRecord.Status;
+import org.knowm.xchange.dto.account.FundingRecord.Type;
 import org.knowm.xchange.dto.account.Wallet;
 import org.knowm.xchange.dto.marketdata.OrderBook;
 import org.knowm.xchange.dto.marketdata.Ticker;
@@ -805,19 +807,17 @@ public static List<FundingRecord> adaptFundingHistory(List<Movement> movementHis
       }
 
       FundingRecord fundingRecordEntry =
-          new FundingRecord(
-              movement.getDestinationAddress(),
-              null,
-              movement.getMtsUpdated(),
-              currency,
-              amount,
-              movement.getId(),
-              movement.getTransactionId(),
-              type,
-              status,
-              null,
-              fee,
-              null);
+          FundingRecord.builder()
+              .address(movement.getDestinationAddress())
+              .date(movement.getMtsStarted())
+              .currency(currency)
+              .amount(amount)
+              .internalId(movement.getId())
+              .blockchainTransactionHash(movement.getTransactionId())
+              .type(type)
+              .status(status)
+              .fee(fee)
+              .build();
 
       fundingRecords.add(fundingRecordEntry);
     }
@@ -868,18 +868,17 @@ and sometimes like this (with the address in it as well as the txn hash):
       }
 
       FundingRecord fundingRecordEntry =
-          new FundingRecord(
-              address,
-              responseEntry.getTimestamp(),
-              currency,
-              responseEntry.getAmount(),
-              String.valueOf(responseEntry.getId()),
-              txnId,
-              responseEntry.getType(),
-              status,
-              null,
-              null,
-              description);
+          FundingRecord.builder()
+              .address(address)
+              .date(responseEntry.getTimestamp())
+              .currency(currency)
+              .amount(responseEntry.getAmount())
+              .internalId(String.valueOf(responseEntry.getId()))
+              .blockchainTransactionHash(txnId)
+              .type(responseEntry.getType())
+              .status(status)
+              .description(description)
+              .build();
 
       fundingRecords.add(fundingRecordEntry);
     }