Skip to content

fix: improve staking reward filter and underlying asset detection #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nyg merged 1 commit into from
Nov 29, 2025
Merged

fix: improve staking reward filter and underlying asset detection #49

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions library/src/main/java/dev/andstuff/kraken/api/endpoint/account/response/LedgerEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package dev.andstuff.kraken.api.endpoint.account.response;

import static java.util.regex.Pattern.matches;

import java.math.BigDecimal;
import java.time.Instant;
import java.time.ZoneId;
import java.util.List;
import java.util.regex.Pattern;

import com.fasterxml.jackson.annotation.JsonEnumDefaultValue;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand All @@ -25,16 +26,24 @@ public record LedgerEntry(@CsvBindByName(column = "txid") @With String id, // TO
@CsvBindByName(column = "balance") BigDecimal balance) {

/**
* Attempts to extract the underlying asset, e.g. DOT.28S returns DOT, XXBT
* Attempts to extract the underlying asset, e.g. DOT28.S returns DOT, XXBT
* returns XBT, ZUSD returns USD.
*
* @return the underlying asset
*/
public String underlyingAsset() {
return switch (asset) {
case String s when Pattern.matches("^[XZ][A-Z]{3}$", s) -> s.substring(1, 4);
case String s when Pattern.matches("^[0-9A-Z]+$", s) -> s;
// Kraken returns DOGE and BTC when exporting ledger as a file, but uses XDG and XBT in the API
case String s when "DOGE".equals(s) -> "XDG";
case String s when "BTC".equals(s) -> "XBT";
// Take care of asset migrations
case String s when "ETH2".equals(s) -> "ETH";
case String s when matches("^MATIC(\\d+\\.S)?$", s) -> "POL";
// Remove X or Z prefix for fiat and some cryptos
case String s when matches("^[XZ][A-Z]{3}$", s) -> s.substring(1, 4);
// Return asset as is if it only contains numbers and capital letters
case String s when matches("^[0-9A-Z]+$", s) -> s;
// Strip staking suffix (e.g. `28.S`)
default -> asset.split("[0-9.]")[0];
};
}
Expand All @@ -44,7 +53,9 @@ public BigDecimal netAmount() {
}

public boolean isStakingReward() {
return List.of(Type.STAKING, Type.EARN).contains(type);
boolean isStakingOrEarnType = List.of(Type.STAKING, Type.EARN).contains(type);
boolean isRewardSubType = !List.of("allocation", "deallocation", "autoallocation", "migration").contains(subType);
return isStakingOrEarnType && isRewardSubType;
}

public int year() {
Expand Down