8: Add 'example' to configuration files

build.gradle.kts

@@ -44,7 +44,6 @@ dependencies {
     runtimeOnly("org.apache.logging.log4j:log4j-core:2.26.0")
     runtimeOnly("org.apache.logging.log4j:log4j-slf4j2-impl:2.26.0")
 
-    implementation("com.r35157.nenjim:hubd-api:0.1-dev")
     implementation("com.fasterxml.jackson.core:jackson-databind:2.18.6")
     implementation("com.fazecast:jSerialComm:2.11.4")
     implementation("com.google.code.gson:gson:2.14.0")

conf/alarms.conf.example

@@ -1,56 +1,4 @@
-# General configurations
+# ID   Asset   Direction   Target    TRIGGER   SEVERITY   NOTE
-#####################################################
+################################################################################################################
-{{JUPITER_PERPS_WALLET}}  8abcYourWalletAddressHere
+1      SOL     BELOW       170.0     ONETIME   INFO       "EMERGENCY: Risiko for Perps Solana long LIKVIDERING!"
-
+2      SOL     BELOW       71.4      ONETIME   CRITICAL   "CRITICAL: Risiko for Solana Raydium LÅN LIKVIDERING!"
-
-# Constant Name             Value
-####################################
-
-{{SOL_LONG_ENTRY_PRICE}}    73.67
-{{SOL_LONG_LIQ_PRICE}}      70.28
-{{SOL_SHORT_ENTRY_PRICE}}   70.47
-{{SOL_SHORT_LIQ_PRICE}}     75.01
-
-{{ETH_LONG_ENTRY_PRICE}}    1589.63
-{{ETH_LONG_LIQ_PRICE}}      1461.11
-{{ETH_SHORT_ENTRY_PRICE}}   1545.29
-{{ETH_SHORT_LIQ_PRICE}}     1698.42
-
-{{BTC_LONG_ENTRY_PRICE}}    61236.03
-{{BTC_LONG_LIQ_PRICE}}      40984.70
-{{BTC_SHORT_ENTRY_PRICE}}   59451.94
-{{BTC_SHORT_LIQ_PRICE}}     65084.53
-
-
-# Id   Asset   Direction                          Target   Trigger           Severity   Note
-###############################################################################################################################
-
-# SOL SHORT
-1      SOL     ABOVE       {{SOL_SHORT_LIQ_PRICE}}-1.25%   ONETIME           CRITICAL   "🚨 LIKVIDERINGS-risiko SOL Short!"
-2      SOL     ABOVE        {{SOL_SHORT_ENTRY_PRICE}}+3%   PERSISTENT:900   INFO       "🌱 Short SOL now"
-3      SOL     BELOW        {{SOL_SHORT_ENTRY_PRICE}}-3%   PERSISTENT:900   INFO       "💵 Close SOL Short"
-
-# SOL LONG
-4      SOL     BELOW        {{SOL_LONG_LIQ_PRICE}}+1.25%   ONETIME           CRITICAL   "🚨 LIKVIDERINGS-risiko SOL Long!"
-5      SOL     BELOW         {{SOL_LONG_ENTRY_PRICE}}-3%   PERSISTENT:900   INFO       "🌱 Long SOL now"
-6      SOL     ABOVE         {{SOL_LONG_ENTRY_PRICE}}+3%   PERSISTENT:900   INFO       "💵 Close SOL Long"
-
-# ETH SHORT
-7      ETH     ABOVE          {{ETH_SHORT_LIQ_PRICE}}-1%   ONETIME           CRITICAL   "🚨 LIKVIDERINGS-risiko ETH Short!"
-8      ETH     ABOVE        {{ETH_SHORT_ENTRY_PRICE}}+3%   PERSISTENT:900   INFO       "🌱 Short ETH now"
-9      ETH     BELOW        {{ETH_SHORT_ENTRY_PRICE}}-3%   PERSISTENT:900   INFO       "💵 Close ETH Short"
-
-# ETH LONG
-10     ETH     BELOW           {{ETH_LONG_LIQ_PRICE}}+1%   ONETIME           CRITICAL   "🚨 LIKVIDERINGS-risiko ETH Long!"
-11     ETH     BELOW         {{ETH_LONG_ENTRY_PRICE}}-3%   PERSISTENT:900   INFO       "🌱 Long ETH now"
-12     ETH     ABOVE         {{ETH_LONG_ENTRY_PRICE}}+3%   PERSISTENT:900   INFO       "💵 Close ETH Long"
-
-# BTC SHORT
-13     BTC     ABOVE          {{BTC_SHORT_LIQ_PRICE}}-1%   ONETIME           CRITICAL   "🚨 LIKVIDERINGS-risiko BTC Short!"
-14     BTC     ABOVE        {{BTC_SHORT_ENTRY_PRICE}}+3%   PERSISTENT:900   INFO       "🌱 Short BTC now"
-15     BTC     BELOW        {{BTC_SHORT_ENTRY_PRICE}}-3%   PERSISTENT:900   INFO       "💵 Close BTC Short"
-
-# BTC LONG
-16     BTC     BELOW           {{BTC_LONG_LIQ_PRICE}}+1%   ONETIME           CRITICAL   "🚨 LIKVIDERINGS-risiko BTC Long!"
-17     BTC     BELOW         {{BTC_LONG_ENTRY_PRICE}}-3%   PERSISTENT:900   INFO       "🌱 Long BTC now"
-18     BTC     ABOVE         {{BTC_LONG_ENTRY_PRICE}}+3%   PERSISTENT:900   INFO       "💵 Close BTC Long"

publishGitHub.sh

@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-if [ "$#" -ne 1 ]; then
-    echo "Usage: $0 <github-snapshot-branch>" >&2
-    exit 1
-fi
-
-BRANCH="$1"
-
-SOURCE="$HOME/projects/com_r35157_nenjim-hubd-impl_ref"
-TARGET="$HOME/projects/com_r35157_nenjim-hubd-impl_ref_github_snapshot"
-
-cd "$TARGET"
-
-git fetch origin
-
-if git show-ref --verify --quiet "refs/heads/$BRANCH"; then
-    git switch "$BRANCH"
-elif git show-ref --verify --quiet "refs/remotes/origin/$BRANCH"; then
-    git switch --track "origin/$BRANCH"
-else
-    git switch --create "$BRANCH"
-fi
-
-rsync -a --delete \
-  --exclude '.git' \
-  --exclude 'conf/*.conf' \
-  --exclude 'conf/*.xml' \
-  "$SOURCE/" \
-  "$TARGET/"
-
-git add -A
-
-if git diff --cached --quiet; then
-    echo "No snapshot changes to publish on branch '$BRANCH'."
-    exit 0
-fi
-
-git commit -m "Mirror snapshot"
-git push -u origin "$BRANCH"

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/AlarmAction.tjava

@@ -2,5 +2,5 @@ package com.r35157.jupiterperpsalarm.impl.ref;
 
 @FunctionalInterface
 public interface AlarmAction {
-    void trigger(OraclePrice price, ResolvedPriceAlarm alarm);
+    void trigger(OraclePrice price, PriceAlarmDefinition alarm);
 }

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/AlarmConfiguration.tjava

@@ -1,19 +0,0 @@
-package com.r35157.jupiterperpsalarm.impl.ref;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
-
-public record AlarmConfiguration(
-        List<PriceAlarmDefinition> definitions,
-        Map<String, String> variables
-) {
-    public AlarmConfiguration {
-        Objects.requireNonNull(definitions, "definitions");
-        Objects.requireNonNull(variables, "variables");
-
-        definitions = List.copyOf(definitions);
-        variables = new ConcurrentHashMap<>(variables);
-    }
-}

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/AlarmConfigurationParser.tjava

@@ -3,31 +3,28 @@ package com.r35157.jupiterperpsalarm.impl.ref;
 import com.r35157.jupiterperpsalarm.AlarmSeverity;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
 
 public final class AlarmConfigurationParser {
 
-    public static AlarmConfiguration parse(Path path) throws IOException {
+    public static List<PriceAlarmDefinition> parse(Path path) throws IOException {
         List<String> lines = Files.readAllLines(path);
         List<PriceAlarmDefinition> alarms = new ArrayList<>();
-        Map<String, String> constants = new LinkedHashMap<>();
 
         for (int lineNumber = 1; lineNumber <= lines.size(); lineNumber++) {
             String line = lines.get(lineNumber - 1);
             String trimmed = line.trim();
-
+            if (trimmed.isEmpty() || trimmed.startsWith("#")) {
-            if(trimmed.isEmpty() || trimmed.startsWith("#")) {
                 continue;
             }
 
             try {
-                if(isConstantDefinition(trimmed)) {
+                alarms.add(parseLine(line));
-                    parseConstantDefinition(constants, line);
-                } else {
-                    alarms.add(parseLine(line));
-                }
             } catch (RuntimeException exception) {
                 throw new IllegalArgumentException(
                         path + ":" + lineNumber + ": " + exception.getMessage(),
@@ -40,7 +37,7 @@ public final class AlarmConfigurationParser {
             throw new IllegalArgumentException("No alarms found in " + path);
         }
 
-        return new AlarmConfiguration(alarms, constants);
+        return List.copyOf(alarms);
     }
 
     static PriceAlarmDefinition parseLine(String line) {
@@ -56,10 +53,10 @@ public final class AlarmConfigurationParser {
                 cursor.nextToken("direction").toUpperCase(Locale.ROOT)
         );
 
-        String targetExpression = cursor.nextToken("target");
+        BigDecimal target = new BigDecimal(cursor.nextToken("target"));
 
-        TriggerConfiguration triggerConfiguration = parseTrigger(
+        AlarmTrigger trigger = AlarmTrigger.valueOf(
-                cursor.nextToken("trigger")
+                cursor.nextToken("trigger").toUpperCase(Locale.ROOT)
         );
 
         AlarmSeverity severity = AlarmSeverity.valueOf(
@@ -79,58 +76,13 @@ public final class AlarmConfigurationParser {
                 id,
                 asset,
                 direction,
-                targetExpression,
+                target,
-                triggerConfiguration.trigger(),
+                trigger,
-                triggerConfiguration.gracePeriod(),
                 severity,
                 note
         );
     }
 
-    private static TriggerConfiguration parseTrigger(String triggerText) {
-        String normalized = triggerText.toUpperCase(Locale.ROOT);
-
-        if (normalized.equals("ONETIME")) {
-            return new TriggerConfiguration(AlarmTrigger.ONETIME, 0);
-        }
-
-        if (normalized.equals("PERSISTENT")) {
-            return new TriggerConfiguration(AlarmTrigger.PERSISTENT, 0);
-        }
-
-        if (normalized.startsWith("PERSISTENT:")) {
-            String graceText = normalized.substring("PERSISTENT:".length());
-
-            if (graceText.isEmpty()) {
-                throw new IllegalArgumentException("Missing persistent grace period: " + triggerText);
-            }
-
-            ΩsecondsΩ gracePeriodSeconds;
-            try {
-                gracePeriodSeconds = Integer.parseInt(graceText);
-            } catch (NumberFormatException exception) {
-                throw new IllegalArgumentException(
-                        "Invalid persistent grace period: " + triggerText,
-                        exception
-                );
-            }
-
-            if (gracePeriodSeconds < 0) {
-                throw new IllegalArgumentException(
-                        "Persistent grace period cannot be negative: " + triggerText
-                );
-            }
-
-            return new TriggerConfiguration(AlarmTrigger.PERSISTENT, gracePeriodSeconds);
-        }
-
-        if (normalized.startsWith("ONETIME:")) {
-            throw new IllegalArgumentException("ONETIME cannot have a grace period: " + triggerText);
-        }
-
-        throw new IllegalArgumentException("Unknown trigger: " + triggerText);
-    }
-
     private static final class Cursor {
         private Cursor(String line) {
             this.line = line;
@@ -215,76 +167,6 @@ public final class AlarmConfigurationParser {
         private int position;
     }
 
-    private static boolean isConstantDefinition(String trimmedLine) {
-        return trimmedLine.startsWith("{{");
-    }
-
-    private static void parseConstantDefinition(
-            Map<String, String> constants,
-            String line
-    ) {
-        Cursor cursor = new Cursor(line);
-
-        String name = cursor.nextToken("constant name");
-        String value = cursor.nextToken("constant value");
-
-        cursor.skipWhitespace();
-        if (!cursor.atEnd() && cursor.current() != '#') {
-            throw new IllegalArgumentException(
-                    "Unexpected text after constant value: " + cursor.remaining()
-            );
-        }
-
-        validateConstantName(name);
-
-        constants.put(parseVariableName(name), value);
-    }
-
-    private static String parseVariableName(String variableName) {
-        if (!variableName.startsWith("{{") || !variableName.endsWith("}}")) {
-            throw new IllegalArgumentException("Invalid variable name: " + variableName);
-        }
-
-        String parsedVariableName = variableName.substring(2, variableName.length() - 2);
-
-        if (parsedVariableName.isBlank()) {
-            throw new IllegalArgumentException("Variable name cannot be blank: " + variableName);
-        }
-
-        return parsedVariableName;
-    }
-
-    private static String replaceConstants(
-            String line,
-            Map<String, String> constants
-    ) {
-        String result = line;
-
-        for (Map.Entry<String, String> entry : constants.entrySet()) {
-            result = result.replace(entry.getKey(), entry.getValue());
-        }
-
-        if (result.contains("{{") || result.contains("}}")) {
-            throw new IllegalArgumentException(
-                    "Unknown or malformed constant in line: " + line
-            );
-        }
-
-        return result;
-    }
-
-    private static void validateConstantName(String name) {
-        if (!name.matches("\\{\\{[A-Z0-9_]+}}")) {
-            throw new IllegalArgumentException("Invalid constant name: " + name);
-        }
-    }
-
-    private record TriggerConfiguration(
-            AlarmTrigger trigger,
-            ΩsecondsΩ gracePeriod
-    ) {
-    }
-
     private AlarmConfigurationParser() {
     }
 }

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/AlarmTargetParser.tjava

@@ -1,60 +0,0 @@
-package com.r35157.jupiterperpsalarm.impl.ref;
-
-import java.math.BigDecimal;
-
-public final class AlarmTargetParser {
-
-    private AlarmTargetParser() {
-    }
-
-    public static BigDecimal parse(String targetStr) {
-        String trimmedTargetStr = targetStr.trim();
-
-        if (trimmedTargetStr.endsWith("%")) {
-            int plusIndex = trimmedTargetStr.indexOf('+');
-            int minusIndex = trimmedTargetStr.indexOf('-', 1);
-
-            if (plusIndex >= 0) {
-                return parseTargetPercentage(trimmedTargetStr, plusIndex, true);
-            }
-
-            if (minusIndex >= 0) {
-                return parseTargetPercentage(trimmedTargetStr, minusIndex, false);
-            }
-        }
-
-        BigDecimal target = new BigDecimal(trimmedTargetStr);
-        validateTarget(target, targetStr);
-        return target;
-    }
-
-    private static BigDecimal parseTargetPercentage(
-            String targetStr,
-            int operatorIndex,
-            boolean add
-    ) {
-        BigDecimal base = new BigDecimal(targetStr.substring(0, operatorIndex));
-        String percentStr = targetStr.substring(operatorIndex + 1, targetStr.length() - 1);
-        BigDecimal percent = new BigDecimal(percentStr);
-
-        BigDecimal delta = base
-                .multiply(percent)
-                .divide(BigDecimal.valueOf(100));
-
-        BigDecimal target = add ? base.add(delta) : base.subtract(delta);
-
-        validateTarget(base, targetStr);
-        validateTarget(percent, targetStr);
-        validateTarget(target, targetStr);
-
-        return target;
-    }
-
-    private static void validateTarget(BigDecimal target, String originalTargetStr) {
-        if (target.compareTo(BigDecimal.ZERO) < 0) {
-            throw new IllegalArgumentException(
-                    "Target must be zero or positive: " + originalTargetStr
-            );
-        }
-    }
-}

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/AlarmVariableResolver.tjava

@@ -1,30 +0,0 @@
-package com.r35157.jupiterperpsalarm.impl.ref;
-
-import java.util.Map;
-import java.util.Objects;
-
-public final class AlarmVariableResolver {
-
-    public AlarmVariableResolver(Map<String, String> variables) {
-        this.variables = Objects.requireNonNull(variables, "variables");
-    }
-
-    public String resolve(String text) {
-        Objects.requireNonNull(text, "text");
-
-        String resolvedText = text;
-
-        for (Map.Entry<String, String> entry : variables.entrySet()) {
-            String placeholder = "{{" + entry.getKey() + "}}";
-            resolvedText = resolvedText.replace(placeholder, entry.getValue());
-        }
-
-        if (resolvedText.contains("{{") || resolvedText.contains("}}")) {
-            throw new IllegalArgumentException("Unresolved variable in text: " + text);
-        }
-
-        return resolvedText;
-    }
-
-    private final Map<String, String> variables;
-}

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/AssetPriceAlarmMonitor.tjava

@@ -12,7 +12,6 @@ public final class AssetPriceAlarmMonitor {
     public AssetPriceAlarmMonitor(
             JupiterPerpsAsset asset,
             List<PriceAlarmDefinition> definitions,
-            AlarmVariableResolver variableResolver,
             AlarmAction action
     ) {
         this.asset = asset;
@@ -23,7 +22,7 @@ public final class AssetPriceAlarmMonitor {
                                 "Alarm asset " + definition.asset() + " does not match monitor " + asset
                         );
                     }
-                    return new PriceAlarm(definition, variableResolver, action);
+                    return new PriceAlarm(definition, action);
                 })
                 .toList();
 

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/CompositeAlarmAction.tjava

@@ -9,7 +9,7 @@ public final class CompositeAlarmAction implements AlarmAction {
     }
 
     @Override
-    public void trigger(OraclePrice price, ResolvedPriceAlarm alarm) {
+    public void trigger(OraclePrice price, PriceAlarmDefinition alarm) {
         for (AlarmAction action : actions) {
             try {
                 action.trigger(price, alarm);

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/ConsoleAlarmAction.tjava

@@ -2,7 +2,7 @@ package com.r35157.jupiterperpsalarm.impl.ref;
 
 public final class ConsoleAlarmAction implements AlarmAction {
     @Override
-    public void trigger(OraclePrice price, ResolvedPriceAlarm alarm) {
+    public void trigger(OraclePrice price, PriceAlarmDefinition alarm) {
         System.err.println();
         System.err.println("============================================================");
         System.err.printf(

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/DovesAgPriceFeedDecoder.tjava

@@ -48,6 +48,25 @@ public final class DovesAgPriceFeedDecoder {
         );
     }
 
+    public static void selfTest() {
+        byte[] data = new byte[ACCOUNT_SIZE];
+        System.arraycopy(AG_PRICE_FEED_DISCRIMINATOR, 0, data, 0, 8);
+
+        putUnsignedLongLittleEndian(data, PRICE_OFFSET, new BigInteger("123456789"));
+        data[EXPONENT_OFFSET] = (byte) -6;
+        ByteBuffer.wrap(data, TIMESTAMP_OFFSET, Long.BYTES)
+                .order(ByteOrder.LITTLE_ENDIAN)
+                .putLong(1_700_000_000L);
+
+        OraclePrice decoded = decode(JupiterPerpsAsset.SOL, data, 42L, "self-test");
+        if (decoded.priceUsd().compareTo(new BigDecimal("123.456789")) != 0) {
+            throw new IllegalStateException("Decoder self-test failed: " + decoded.priceUsd());
+        }
+        if (!decoded.oracleTime().equals(Instant.ofEpochSecond(1_700_000_000L))) {
+            throw new IllegalStateException("Timestamp self-test failed");
+        }
+    }
+
     private static BigInteger readUnsignedLongLittleEndian(byte[] data, int offset) {
         byte[] positiveBigEndian = new byte[Long.BYTES + 1];
         for (int index = 0; index < Long.BYTES; index++) {

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/JupiterPerpsAlarmImpl.tjava

@@ -1,10 +1,5 @@
 package com.r35157.jupiterperpsalarm.impl.ref;
 
-import com.r35157.libs.jupiter.perps.JupiterPerpsService;
-import com.r35157.libs.jupiter.perps.impl.anchoridl.AnchorIdlJupiterPerpsServiceImpl;
-import com.r35157.libs.solana.SolanaBlockChain;
-import com.r35157.libs.solana.impl.ref.SolanaBlockChainImpl;
-
 import java.net.URI;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -18,7 +13,6 @@ public final class JupiterPerpsAlarmImpl {
 
     public static void main(String[] args) throws Exception {
         Config config;
-
         try {
             config = Config.parse(args, System.getenv());
         } catch (IllegalArgumentException exception) {
@@ -27,35 +21,20 @@ public final class JupiterPerpsAlarmImpl {
             throw new IllegalStateException(errMsg, exception);
         }
 
-        List<PriceAlarmDefinition> definitions;
+        if (config.selfTest()) {
-        AlarmConfiguration alarmConfiguration;
+            SelfTest.run();
+            System.out.println("All self-tests passed.");
+            return;
+        }
 
+        List<PriceAlarmDefinition> definitions;
         try {
-            alarmConfiguration = AlarmConfigurationParser.parse(config.alarmConfiguration());
+            definitions = AlarmConfigurationParser.parse(config.alarmConfiguration());
-            definitions = alarmConfiguration.definitions();
         } catch (Exception exception) {
             String errMsg = "Could not load alarm configuration: " + exception.getMessage() + "!";
             throw new IllegalStateException(errMsg, exception);
         }
 
-        AlarmVariableResolver variableResolver = new AlarmVariableResolver(
-                alarmConfiguration.variables()
-        );
-
-        SolanaBlockChain solanaBlockChain = new SolanaBlockChainImpl();
-        JupiterPerpsService jupiterPerpsService = new AnchorIdlJupiterPerpsServiceImpl(solanaBlockChain);
-        JupiterPerpsEntryPriceVariableRefresher entryPriceVariableRefresher =
-                new JupiterPerpsEntryPriceVariableRefresher(alarmConfiguration.variables(), jupiterPerpsService);
-        entryPriceVariableRefresher.refresh();
-
-        JupiterPerpsEntryPriceVariableRefreshWatcher entryPriceVariableRefreshWatcher =
-                new JupiterPerpsEntryPriceVariableRefreshWatcher(
-                        config.alarmConfiguration().getParent(),
-                        entryPriceVariableRefresher
-                );
-
-        entryPriceVariableRefreshWatcher.start();
-
         List<AlarmAction> actions = new ArrayList<>();
         actions.add(new ConsoleAlarmAction());
 
@@ -79,10 +58,9 @@ public final class JupiterPerpsAlarmImpl {
         Map<JupiterPerpsAsset, AssetPriceAlarmMonitor> monitors = new EnumMap<>(
                 JupiterPerpsAsset.class
         );
-
         definitionsByAsset.forEach((asset, assetDefinitions) -> monitors.put(
                 asset,
-                new AssetPriceAlarmMonitor(asset, assetDefinitions, variableResolver, action)
+                new AssetPriceAlarmMonitor(asset, assetDefinitions, action)
         ));
 
         List<OracleWebSocketClient> clients = new ArrayList<>();
@@ -113,7 +91,7 @@ public final class JupiterPerpsAlarmImpl {
             assetDefinitions.forEach(definition -> System.out.printf(
                     "    %s %s USD, %s, severity=%s%n",
                     definition.direction(),
-                    definition.targetExpression(),
+                    definition.target().toPlainString(),
                     definition.trigger(),
                     definition.severity()
             ));
@@ -148,6 +126,7 @@ public final class JupiterPerpsAlarmImpl {
                 Options:
                   --config=<path>            Default: price-alarms.conf
                   --ws=<url1,url2,...>       Default: wss://api.mainnet-beta.solana.com
+                  --self-test                Test parser, alarm semantics and oracle decoder
 
                 Environment:
                   PRICE_ALARMS_CONFIG        Alternative default configuration path
@@ -161,9 +140,11 @@ public final class JupiterPerpsAlarmImpl {
             Path alarmConfiguration,
             List<URI> webSocketEndpoints,
             String pushoverToken,
-            String pushoverUserKey
+            String pushoverUserKey,
+            boolean selfTest
     ) {
         private static Config parse(String[] args, Map<String, String> environment) {
+            boolean selfTest = Arrays.asList(args).contains("--self-test");
             Map<String, String> options = Arrays.stream(args)
                     .filter(argument -> argument.startsWith("--") && argument.contains("="))
                     .map(argument -> argument.substring(2).split("=", 2))
@@ -203,7 +184,8 @@ public final class JupiterPerpsAlarmImpl {
                     Path.of(configurationText),
                     endpoints,
                     blankToNull(environment.get("PUSHOVER_APP_TOKEN")),
-                    blankToNull(environment.get("PUSHOVER_USER_KEY"))
+                    blankToNull(environment.get("PUSHOVER_USER_KEY")),
+                    selfTest
             );
         }
 

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/JupiterPerpsEntryPriceVariableRefreshWatcher.tjava

@@ -1,92 +0,0 @@
-package com.r35157.jupiterperpsalarm.impl.ref;
-
-import java.nio.file.*;
-import java.util.Objects;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.FileSystems;
-import java.nio.file.StandardWatchEventKinds;
-import java.nio.file.WatchEvent;
-import java.nio.file.WatchKey;
-import java.nio.file.WatchService;
-
-public final class JupiterPerpsEntryPriceVariableRefreshWatcher {
-
-    public JupiterPerpsEntryPriceVariableRefreshWatcher(
-            Path confDirectory,
-            JupiterPerpsEntryPriceVariableRefresher refresher
-    ) {
-        this.confDirectory = Objects.requireNonNull(confDirectory, "confDirectory");
-        this.refresher = Objects.requireNonNull(refresher, "refresher");
-    }
-
-    public void start() {
-        Thread thread = new Thread(
-                this::run,
-                "jupiter-perps-entry-price-variable-refresh-watcher"
-        );
-
-        thread.setDaemon(true);
-        thread.start();
-    }
-
-    private void run() {
-        try (WatchService watchService = FileSystems.getDefault().newWatchService()) {
-
-            confDirectory.register(
-                    watchService,
-                    StandardWatchEventKinds.ENTRY_CREATE
-            );
-
-            System.out.println(
-                    "Jupiter Perps entry price variable refresh watcher started for directory: "
-                            + confDirectory
-            );
-            while (true) {
-                WatchKey key = watchService.take();
-
-                for (WatchEvent<?> event : key.pollEvents()) {
-                    Path path = (Path) event.context();
-
-                    if (!REFRESH_TRIGGER_FILE_NAME.equals(path.getFileName().toString())) {
-                        continue;
-                    }
-
-                    Path triggerFile = confDirectory.resolve(path);
-
-                    System.out.println("Refresh trigger file detected: " + triggerFile);
-
-                    try {
-                        refresher.refresh();
-                    } finally {
-                        Files.deleteIfExists(triggerFile);
-                    }
-                }
-
-                if (!key.reset()) {
-                    System.err.println(
-                            "Jupiter Perps entry price variable refresh watcher stopped: watch key is no longer valid"
-                    );
-                    return;
-                }
-            }
-        } catch (IOException exception) {
-            System.err.println(
-                    "Could not start Jupiter Perps entry price variable refresh watcher: "
-                            + exception.getMessage()
-            );
-        } catch (InterruptedException exception) {
-            Thread.currentThread().interrupt();
-
-            System.err.println(
-                    "Jupiter Perps entry price variable refresh watcher interrupted"
-            );
-        }
-    }
-
-    private static final String REFRESH_TRIGGER_FILE_NAME =
-            "jupiter-perps-alarm-var.refresh";
-
-    private final Path confDirectory;
-    private final JupiterPerpsEntryPriceVariableRefresher refresher;
-}

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/JupiterPerpsEntryPriceVariableRefresher.tjava

@@ -1,86 +0,0 @@
-package com.r35157.jupiterperpsalarm.impl.ref;
-
-import com.r35157.libs.jupiter.perps.JupiterPerpsPosition;
-import com.r35157.libs.jupiter.perps.JupiterPerpsService;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-
-public final class JupiterPerpsEntryPriceVariableRefresher {
-
-    public JupiterPerpsEntryPriceVariableRefresher(
-            Map<String, String> variables,
-            JupiterPerpsService jupiterPerpsService
-    ) {
-        this.variables = Objects.requireNonNull(variables, "variables");
-        this.jupiterPerpsService = Objects.requireNonNull(jupiterPerpsService, "jupiterPerpsService");
-    }
-
-    public void refresh() {
-        ΩSolanaWalletIdΩ  wallet = variables.get("JUPITER_PERPS_WALLET");
-
-        if (wallet == null || wallet.isBlank()) {
-            System.err.println("Cannot refresh Jupiter Perps entry price variables: JUPITER_PERPS_WALLET is not configured");
-            return;
-        }
-
-        try {
-            Set<JupiterPerpsPosition> positions = jupiterPerpsService.getOpenPositions(wallet);
-
-            System.out.println(
-                    "Fetched " + positions.size()
-                            + " open Jupiter Perps positions for wallet: " + wallet
-            );
-
-            removeEntryPriceVariables();
-
-            for (JupiterPerpsPosition position : positions) {
-                String variableName = createEntryPriceVariableName(position);
-
-                System.out.println(
-                        "Jupiter Perps position maps to variable "
-                                + variableName
-                                + " = "
-                                + position.entryPrice()
-                );
-                variables.put(variableName, position.entryPrice().toPlainString());
-            }
-        } catch (IOException | InterruptedException exception) {
-            if (exception instanceof InterruptedException) {
-                Thread.currentThread().interrupt();
-            }
-
-            System.err.println(
-                    "Could not refresh Jupiter Perps entry price variables: "
-                            + exception.getMessage()
-            );
-        }
-    }
-
-    private void removeEntryPriceVariables() {
-        variables.remove("SOL_LONG_ENTRY_PRICE");
-        variables.remove("SOL_SHORT_ENTRY_PRICE");
-        variables.remove("BTC_LONG_ENTRY_PRICE");
-        variables.remove("BTC_SHORT_ENTRY_PRICE");
-        variables.remove("ETH_LONG_ENTRY_PRICE");
-        variables.remove("ETH_SHORT_ENTRY_PRICE");
-    }
-
-    private static String createEntryPriceVariableName(JupiterPerpsPosition position) {
-        String asset = switch (position.tradedTokenMint()) {
-            case "So11111111111111111111111111111111111111112" -> "SOL";
-            case "3NZ9JMVBmGAqocybic2c7LQCJScmgsAZ6vQqTDzcqmJh" -> "BTC";
-            case "7vfCXTUXx5WJV5JADk17DUJ4ksgau7utNKj4b963voxs" -> "ETH";
-            default -> throw new IllegalArgumentException(
-                    "Unsupported Jupiter Perps traded token mint: " + position.tradedTokenMint()
-            );
-        };
-
-        return asset + "_" + position.direction() + "_ENTRY_PRICE";
-    }
-
-    private final Map<String, String> variables;
-    private final JupiterPerpsService jupiterPerpsService;
-}

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/PriceAlarm.tjava

@@ -1,17 +1,9 @@
 package com.r35157.jupiterperpsalarm.impl.ref;
 
-import java.math.BigDecimal;
-import java.time.Instant;
-
 public final class PriceAlarm {
 
-    public PriceAlarm(
+    public PriceAlarm(PriceAlarmDefinition definition, AlarmAction action) {
-            PriceAlarmDefinition definition,
-            AlarmVariableResolver variableResolver,
-            AlarmAction action
-    ) {
         this.definition = definition;
-        this.variableResolver = variableResolver;
         this.action = action;
     }
 
@@ -22,23 +14,9 @@ public final class PriceAlarm {
             );
         }
 
-        BigDecimal target;
-        try {
-            target = AlarmTargetParser.parse(
-                    variableResolver.resolve(definition.targetExpression())
-            );
-        } catch (RuntimeException exception) {
-            System.err.printf(
-                    "Could not resolve target for alarm %d: %s%n",
-                    definition.id(),
-                    exception.getMessage()
-            );
-            return;
-        }
-
         boolean reached = definition.direction().reached(
                 price.priceUsd(),
-                target
+                definition.target()
         );
 
         boolean enteredTriggeredSide = previousReached == null
@@ -47,28 +25,16 @@ public final class PriceAlarm {
 
         previousReached = reached;
 
-        if (!reached) {
+        if (!enteredTriggeredSide) {
-            previousReached = false;
             return;
         }
 
-        if (definition.trigger() == AlarmTrigger.ONETIME) {
+        if (definition.trigger() == AlarmTrigger.ONETIME && triggerCount > 0) {
-            if (!enteredTriggeredSide || triggerCount > 0) {
-                return;
-            }
-
-            trigger(price, target);
             return;
         }
 
-        if (definition.trigger() == AlarmTrigger.PERSISTENT) {
+        triggerCount++;
-            if (lastTriggeredAt == null || persistentGracePeriodHasPassed()) {
+        action.trigger(price, definition);
-                trigger(price, target);
-            }
-            return;
-        }
-
-        throw new IllegalStateException("Unsupported alarm trigger: " + definition.trigger());
     }
 
     public PriceAlarmDefinition definition() {
@@ -79,58 +45,9 @@ public final class PriceAlarm {
         return triggerCount;
     }
 
-    private boolean persistentGracePeriodHasPassed() {
-        if (lastTriggeredAt == null) {
-            return true;
-        }
-
-        ΩsecondsΩ gracePeriod = definition.triggerGracePeriod();
-
-        if (gracePeriod == 0) {
-            return true;
-        }
-
-        return !Instant.now().isBefore(
-                lastTriggeredAt.plusSeconds(gracePeriod)
-        );
-    }
-
-    private void trigger(OraclePrice price, BigDecimal target) {
-        triggerCount++;
-        lastTriggeredAt = Instant.now();
-
-        String note;
-
-        try {
-            note = variableResolver.resolve(definition.note());
-        } catch (RuntimeException exception) {
-            System.err.printf(
-                    "Could not resolve note for alarm %d: %s%n",
-                    definition.id(),
-                    exception.getMessage()
-            );
-            return;
-        }
-
-        ResolvedPriceAlarm resolvedAlarm = new ResolvedPriceAlarm(
-                definition.id(),
-                definition.asset(),
-                definition.direction(),
-                target,
-                definition.trigger(),
-                definition.triggerGracePeriod(),
-                definition.severity(),
-                note
-        );
-
-        action.trigger(price, resolvedAlarm);
-    }
-
     private final PriceAlarmDefinition definition;
-    private final AlarmVariableResolver variableResolver;
     private final AlarmAction action;
 
-    private Instant lastTriggeredAt;
     private Boolean previousReached;
     private long triggerCount;
 }

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/PriceAlarmDefinition.tjava

@@ -2,34 +2,27 @@ package com.r35157.jupiterperpsalarm.impl.ref;
 
 import com.r35157.jupiterperpsalarm.AlarmSeverity;
 
+import java.math.BigDecimal;
 import java.util.Objects;
 
 public record PriceAlarmDefinition(
         int id,
         JupiterPerpsAsset asset,
         PriceDirection direction,
-        String targetExpression,
+        BigDecimal target,
         AlarmTrigger trigger,
-        ΩsecondsΩ triggerGracePeriod,
         AlarmSeverity severity,
         String note
 ) {
     public PriceAlarmDefinition {
         Objects.requireNonNull(asset, "asset");
         Objects.requireNonNull(direction, "direction");
-        Objects.requireNonNull(targetExpression, "targetExpression");
+        Objects.requireNonNull(target, "target");
         Objects.requireNonNull(trigger, "trigger");
-        Objects.requireNonNull(severity, "severity");
         Objects.requireNonNull(note, "note");
 
-        if (targetExpression.isBlank()) {
+        if (target.signum() < 0) {
-            throw new IllegalArgumentException("Target expression cannot be blank");
+            throw new IllegalArgumentException("Target price cannot be negative (was: " + target.signum() + ")!");
-        }
-
-        if (triggerGracePeriod < 0) {
-            throw new IllegalArgumentException(
-                    "Trigger grace period cannot be negative: " + triggerGracePeriod
-            );
         }
     }
 }

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/PushoverAlarmAction.tjava

@@ -18,15 +18,25 @@ public final class PushoverAlarmAction implements AlarmAction {
     }
 
     @Override
-    public void trigger(OraclePrice price, ResolvedPriceAlarm alarm) {
+    public void trigger(OraclePrice price, PriceAlarmDefinition alarm) {
         String title = "Jupiter Perps " + price.asset() + " alarm";
-        String message = createMessage(price, alarm);
+        String message = String.format(
+                "%s is %s USD. Target: %s %s USD. Oracle time: %s. Slot: %d.",
+                price.asset(),
+                price.priceUsd().toPlainString(),
+                alarm.direction(),
+                alarm.target().toPlainString(),
+                price.oracleTime(),
+                price.slot()
+        );
 
+        // TODO: Note is intentionally parsed and retained in the model, but are not used by Pushover yet.
+        // https://git.r35157.com/r35157/com_r35157_nenjim-hubd-impl_ref/issues/7
         String body = form("token", applicationToken) + "&" +
                 form("user", userKey) + "&" +
                 form("title", title) + "&" +
                 form("message", message) + "&" +
-                createPushoverSeverityParameters(alarm.severity());
+                createPushoverSeverityParameters(alarm.severity());;
 
         HttpRequest request = HttpRequest.newBuilder(PUSHOVER_URI)
                 .timeout(Duration.ofSeconds(15))
@@ -69,21 +79,6 @@ public final class PushoverAlarmAction implements AlarmAction {
         };
     }
 
-    private static String createMessage(OraclePrice price, ResolvedPriceAlarm alarm) {
-        return String.format(
-                "%d - %s: %s%n%n%s is %s USD.%nTarget: %s %s USD.%nOracle time: %s.%nSlot: %d.",
-                alarm.id(),
-                alarm.severity(),
-                alarm.note(),
-                price.asset(),
-                price.priceUsd().toPlainString(),
-                alarm.direction(),
-                alarm.target().toPlainString(),
-                price.oracleTime(),
-                price.slot()
-        );
-    }
-
     private final HttpClient httpClient = HttpClient.newHttpClient();
     private final String applicationToken;
     private final String userKey;

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/ResolvedPriceAlarm.tjava

@@ -1,16 +0,0 @@
-package com.r35157.jupiterperpsalarm.impl.ref;
-
-import com.r35157.jupiterperpsalarm.AlarmSeverity;
-import java.math.BigDecimal;
-
-public record ResolvedPriceAlarm(
-        int id,
-        JupiterPerpsAsset asset,
-        PriceDirection direction,
-        BigDecimal target,
-        AlarmTrigger trigger,
-        ΩsecondsΩ triggerGracePeriod,
-        AlarmSeverity severity,
-        String note
-) {
-}

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/SelfTest.tjava

@@ -0,0 +1,121 @@
+package com.r35157.jupiterperpsalarm.impl.ref;
+
+import com.r35157.jupiterperpsalarm.AlarmSeverity;
+
+import java.math.BigDecimal;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+
+public final class SelfTest {
+
+    public static void run() {
+        DovesAgPriceFeedDecoder.selfTest();
+        configurationParserTest();
+        oneTimeAlarmTest();
+        persistentAlarmTest();
+        initialTriggerTest();
+    }
+
+    private static void configurationParserTest() {
+        PriceAlarmDefinition alarm = AlarmConfigurationParser.parseLine(
+                "SOL ABOVE 75.7 ONETIME CRITICAL \"ALARM: Risiko for likvidering!\""
+        );
+
+        require(alarm.asset() == JupiterPerpsAsset.SOL, "Asset parsing failed");
+        require(alarm.direction() == PriceDirection.ABOVE, "Direction parsing failed");
+        require(alarm.target().compareTo(new BigDecimal("75.7")) == 0, "Target parsing failed");
+        require(alarm.trigger() == AlarmTrigger.ONETIME, "Trigger parsing failed");
+        require(alarm.severity() == AlarmSeverity.CRITICAL, "Severity parsing failed");
+        require(alarm.note().equals("ALARM: Risiko for likvidering!"), "Note parsing failed");
+    }
+
+    private static void oneTimeAlarmTest() {
+        List<BigDecimal> triggeredPrices = new ArrayList<>();
+        PriceAlarm alarm = new PriceAlarm(
+                definition(PriceDirection.ABOVE, "100", AlarmTrigger.ONETIME),
+                (price, definition) -> triggeredPrices.add(price.priceUsd())
+        );
+
+        accept(alarm, "90");
+        accept(alarm, "100");
+        accept(alarm, "110");
+        accept(alarm, "90");
+        accept(alarm, "101");
+
+        require(triggeredPrices.equals(List.of(new BigDecimal("100"))), "ONETIME semantics failed");
+    }
+
+    private static void persistentAlarmTest() {
+        List<BigDecimal> triggeredPrices = new ArrayList<>();
+        PriceAlarm alarm = new PriceAlarm(
+                definition(PriceDirection.BELOW, "100", AlarmTrigger.PERSISTENT),
+                (price, definition) -> triggeredPrices.add(price.priceUsd())
+        );
+
+        accept(alarm, "110");
+        accept(alarm, "99");
+        accept(alarm, "98");
+        accept(alarm, "101");
+        accept(alarm, "100");
+
+        require(
+                triggeredPrices.equals(List.of(new BigDecimal("99"), new BigDecimal("100"))),
+                "PERSISTENT crossing semantics failed"
+        );
+    }
+
+    private static void initialTriggerTest() {
+        List<BigDecimal> triggeredPrices = new ArrayList<>();
+        PriceAlarm alarm = new PriceAlarm(
+                definition(PriceDirection.ABOVE, "100", AlarmTrigger.PERSISTENT),
+                (price, definition) -> triggeredPrices.add(price.priceUsd())
+        );
+
+        accept(alarm, "105");
+        accept(alarm, "106");
+
+        require(
+                triggeredPrices.equals(List.of(new BigDecimal("105"))),
+                "Initial satisfied alarm did not trigger exactly once"
+        );
+    }
+
+    private static PriceAlarmDefinition definition(
+            PriceDirection direction,
+            String target,
+            AlarmTrigger trigger
+    ) {
+        return new PriceAlarmDefinition(
+                123,
+                JupiterPerpsAsset.SOL,
+                direction,
+                new BigDecimal(target),
+                trigger,
+                AlarmSeverity.CRITICAL,
+                "ignored for now"
+        );
+    }
+
+    private static void accept(PriceAlarm alarm, String price) {
+        BigDecimal decimal = new BigDecimal(price);
+        alarm.accept(new OraclePrice(
+                JupiterPerpsAsset.SOL,
+                decimal.unscaledValue().abs(),
+                -decimal.scale(),
+                decimal,
+                Instant.ofEpochSecond(1_700_000_000L),
+                1L,
+                "self-test"
+        ));
+    }
+
+    private static void require(boolean condition, String message) {
+        if (!condition) {
+            throw new IllegalStateException(message);
+        }
+    }
+
+    private SelfTest() {
+    }
+}

src/main/tjava/com/r35157/jupiterperpsalarm/impl/ref/TriggerConfiguration.java

@@ -1,2 +0,0 @@
-package com.r35157.jupiterperpsalarm.impl.ref;
-

src/main/tjava/com/r35157/libs/codec/Base58Codec.tjava

@@ -1,5 +0,0 @@
-package com.r35157.libs.codec;
-
-public interface Base58Codec {
-    String encode(byte[] input);
-}

src/main/tjava/com/r35157/libs/codec/impl/ref/Base58CodecImpl.tjava

@@ -1,70 +0,0 @@
-package com.r35157.libs.codec.impl.ref;
-
-import com.r35157.libs.codec.Base58Codec;
-
-public class Base58CodecImpl implements Base58Codec {
-
-    public String encode(byte[] input) {
-        if (input.length == 0) {
-            return "";
-        }
-
-        byte[] copy = input.clone();
-
-        int zeros = 0;
-        while (zeros < copy.length && copy[zeros] == 0) {
-            zeros++;
-        }
-
-        char[] encoded = new char[copy.length * 2];
-        int outputStart = encoded.length;
-
-        int inputStart = zeros;
-        while (inputStart < copy.length) {
-            int remainder = divmod58(
-                    copy,
-                    inputStart
-            );
-
-            if (copy[inputStart] == 0) {
-                inputStart++;
-            }
-
-            encoded[--outputStart] = ALPHABET[remainder];
-        }
-
-        while (outputStart < encoded.length && encoded[outputStart] == ENCODED_ZERO) {
-            outputStart++;
-        }
-
-        while (zeros-- > 0) {
-            encoded[--outputStart] = ENCODED_ZERO;
-        }
-
-        return new String(
-                encoded,
-                outputStart,
-                encoded.length - outputStart
-        );
-    }
-
-    private static int divmod58(byte[] number, int startAt) {
-        int remainder = 0;
-
-        for (int i = startAt; i < number.length; i++) {
-            int digit = number[i] & 0xff;
-            int temp = remainder * 256 + digit;
-
-            number[i] = (byte) (temp / 58);
-            remainder = temp % 58;
-        }
-
-        return remainder;
-    }
-
-    private static final char[] ALPHABET =
-            "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz".toCharArray();
-
-    private static final char ENCODED_ZERO =
-            ALPHABET[0];
-}

src/main/tjava/com/r35157/libs/jupiter/perps/JupiterPerpsPosition.tjava

@@ -1,47 +0,0 @@
-package com.r35157.libs.jupiter.perps;
-
-import com.r35157.libs.valuetypes.basic.MoneyAmount;
-
-import java.math.BigDecimal;
-
-/**
- * Represents a Jupiter Perps position.
- *
- * <p>A Jupiter Perps position is represented on-chain by a Solana account owned by
- * the Jupiter Perps program. This record contains the public API view of such a
- * position.</p>
- *
- * @param positionAccount the Solana account address of the Jupiter Perps position
- * @param tradedTokenMint the mint address of the token being traded
- * @param direction whether the position is long or short
- * @param value the amount the position is worth if closed now
- * @param size the leveraged amount used to open the contracts
- * @param pnl the amount in usd in profit or loss on this position
- * @param pnlPercent the profit and loss represented as a percentage
- * @param leverage TODO
- * @param entryPrice the entry price of the position, denominated in USDC
- * @param marketPrice the current spot price of the token
- * @param collateral the amount of USD representing the collateral for this position
- * @param totalFees the total amount of fees (TODO: is that including pending/due fees)
- * @param borrowFeesDue the amount of USD that is currently outstanding
- * @param closeFeePending the fee in USD for closing the account (TODO: multiple accounts - when adding collateral?)
- * @param accountRent refundable amount locked for Solana account renting
- */
-public record JupiterPerpsPosition(
-        ΩJupiterPerpsPositionAccountΩ positionAccount,
-        ΩSPLMintAddressΩ tradedTokenMint,
-        JupiterPerpsPositionDirection direction,
-        ΩUSDCAmountΩ value,
-        ΩUSDCAmountΩ size,
-        ΩUSDCAmountΩ pnl,
-        BigDecimal pnlPercent,
-        BigDecimal leverage,
-        ΩUSDCPriceΩ entryPrice,
-        ΩUSDCPriceΩ marketPrice,
-        ΩUSDCAmountΩ collateral,
-        ΩUSDCAmountΩ totalFees,
-        ΩUSDCAmountΩ borrowFeesDue,
-        ΩUSDCAmountΩ closeFeePending,
-        ΩSolanaAmountΩ accountRent
-) {
-}

src/main/tjava/com/r35157/libs/jupiter/perps/JupiterPerpsPositionDirection.tjava

@@ -1,9 +0,0 @@
-package com.r35157.libs.jupiter.perps;
-
-/**
- * Direction of a Jupiter Perps position.
- */
-public enum JupiterPerpsPositionDirection {
-    LONG,
-    SHORT
-}

src/main/tjava/com/r35157/libs/jupiter/perps/JupiterPerpsService.tjava

@@ -1,48 +0,0 @@
-package com.r35157.libs.jupiter.perps;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.io.IOException;
-import java.util.Set;
-
-/**
- * Service for reading Jupiter Perps data.
- *
- * <p>This service is read-only. It does not open, close, modify, or sign transactions
- * for Jupiter Perpetual Contracts.</p>
- *
- * <p>NOTICE: The first supported operation is reading a known Jupiter Perps position account
- * and returning its decoded position data.</p>
- */
-public interface JupiterPerpsService {
-    /**
-     * Reads a Jupiter Perps position from a known position account.
-     *
-     * <p>The supplied account must be the Solana account that stores the Jupiter Perps
-     * position state. It is not the wallet address, token account, custody account, pool
-     * account, or position request account.</p>
-     *
-     * @param positionAccount the Solana account address of the Jupiter Perps position
-     * @return the decoded Jupiter Perps position
-     * @throws IOException if the position account could not be fetched or decoded
-     * @throws InterruptedException if the calling thread is interrupted while fetching
-     *                              the position account
-     */
-    @Nullable JupiterPerpsPosition getPosition(@NotNull ΩJupiterPerpsPositionAccountΩ positionAccount)
-            throws IOException, InterruptedException;
-
-    /**
-     * Finds open Jupiter Perps positions owned by a wallet.
-     *
-     * <p>This method returns decoded Jupiter Perps position objects. It does not return
-     * raw Solana accounts or account ids.</p>
-     *
-     * @param owner the wallet address that owns the Jupiter Perps positions
-     * @return the open Jupiter Perps positions owned by the wallet
-     * @throws IOException if the position accounts could not be fetched or decoded
-     * @throws InterruptedException if the calling thread is interrupted while fetching positions
-     */
-    @NotNull Set<JupiterPerpsPosition> getOpenPositions(@NotNull ΩSolanaWalletIdΩ owner)
-            throws IOException, InterruptedException;
-}

src/main/tjava/com/r35157/libs/jupiter/perps/impl/anchoridl/AnchorIdlJupiterPerpsCustodyDecoder.tjava

@@ -1,50 +0,0 @@
-package com.r35157.libs.jupiter.perps.impl.anchoridl;
-
-import com.r35157.libs.codec.Base58Codec;
-import com.r35157.libs.codec.impl.ref.Base58CodecImpl;
-import com.r35157.libs.solana.SolanaAccountInfo;
-
-import java.util.Base64;
-
-class AnchorIdlJupiterPerpsCustodyDecoder {
-
-    ΩSPLMintAddressΩ decodeMint(
-            SolanaAccountInfo custodyAccountInfo
-    ) {
-        byte[] data = Base64.getDecoder().decode(custodyAccountInfo.dataBase64());
-
-        if (data.length < MINT_OFFSET + PUBLIC_KEY_LENGTH) {
-            throw new IllegalArgumentException(
-                    "Jupiter Perps custody account data is too short: " + data.length
-            );
-        }
-
-        return readPublicKey(data, MINT_OFFSET);
-    }
-
-    private ΩSPLMintAddressΩ readPublicKey(
-            byte[] data,
-            int offset
-    ) {
-        byte[] publicKeyBytes = new byte[PUBLIC_KEY_LENGTH];
-
-        System.arraycopy(
-                data,
-                offset,
-                publicKeyBytes,
-                0,
-                PUBLIC_KEY_LENGTH
-        );
-
-        return base58.encode(publicKeyBytes);
-    }
-
-    private static final int ANCHOR_DISCRIMINATOR_LENGTH = 8;
-    private static final int PUBLIC_KEY_LENGTH = 32;
-
-    private static final int MINT_OFFSET =
-            ANCHOR_DISCRIMINATOR_LENGTH
-                    + PUBLIC_KEY_LENGTH; // pool
-
-    private static final Base58Codec base58 = new Base58CodecImpl();
-}

src/main/tjava/com/r35157/libs/jupiter/perps/impl/anchoridl/AnchorIdlJupiterPerpsPositionDecoder.tjava

@@ -1,128 +0,0 @@
-package com.r35157.libs.jupiter.perps.impl.anchoridl;
-
-import com.r35157.libs.codec.Base58Codec;
-import com.r35157.libs.codec.impl.ref.Base58CodecImpl;
-import com.r35157.libs.jupiter.perps.JupiterPerpsPositionDirection;
-import com.r35157.libs.solana.SolanaAccountInfo;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.math.BigDecimal;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.Base64;
-
-import static java.math.BigDecimal.ZERO;
-
-class AnchorIdlJupiterPerpsPositionDecoder {
-
-    @Nullable JupiterPerpsPositionInfo decode(@NotNull SolanaAccountInfo accountInfo) {
-        byte[] data = Base64.getDecoder().decode(accountInfo.dataBase64());
-
-        if (data.length < PRICE_OFFSET + U64_LENGTH) {
-            throw new IllegalArgumentException(
-                    "Jupiter Perps position account data is too short: " + data.length
-            );
-        }
-
-        JupiterPerpsPositionDirection direction =
-                decodeDirection(data[SIDE_OFFSET]);
-
-        long rawEntryPrice = ByteBuffer
-                .wrap(data, PRICE_OFFSET, U64_LENGTH)
-                .order(ByteOrder.LITTLE_ENDIAN)
-                .getLong();
-
-        ΩUSDCPriceΩ entryPrice = BigDecimal
-                .valueOf(rawEntryPrice)
-                .movePointLeft(6);
-
-        long rawCollateralUsd = ByteBuffer
-                .wrap(data, COLLATERAL_USD_OFFSET, U64_LENGTH)
-                .order(ByteOrder.LITTLE_ENDIAN)
-                .getLong();
-
-        ΩUSDCAmountΩ collateralUsd = BigDecimal
-                .valueOf(rawCollateralUsd)
-                .movePointLeft(6);
-
-        long rawSizeUsd = ByteBuffer
-                .wrap(data, SIZE_USD_OFFSET, U64_LENGTH)
-                .order(ByteOrder.LITTLE_ENDIAN)
-                .getLong();
-
-        ΩUSDCAmountΩ sizeUsd = BigDecimal
-                .valueOf(rawSizeUsd)
-                .movePointLeft(6);
-
-        JupiterPerpsPositionInfo posInfo = new JupiterPerpsPositionInfo(entryPrice, direction, sizeUsd, collateralUsd);
-
-        return posInfo;
-    }
-
-    ΩSolanaAddressΩ decodeCustodyAccount(SolanaAccountInfo accountInfo) {
-        byte[] data = Base64.getDecoder().decode(accountInfo.dataBase64());
-
-        if (data.length < CUSTODY_OFFSET + PUBLIC_KEY_LENGTH) {
-            throw new IllegalArgumentException(
-                    "Jupiter Perps position account data is too short: " + data.length
-            );
-        }
-
-        return readPublicKey(
-                data,
-                CUSTODY_OFFSET
-        );
-    }
-
-    private JupiterPerpsPositionDirection decodeDirection(
-            byte rawSide
-    ) {
-        // Jupiter Perps position side values are encoded as 1 = LONG, 2 = SHORT.
-        JupiterPerpsPositionDirection direction = switch (rawSide) {
-            case 1 -> JupiterPerpsPositionDirection.LONG;
-            case 2 -> JupiterPerpsPositionDirection.SHORT;
-            default -> throw new IllegalArgumentException(
-                    "Unknown Jupiter Perps position side: " + rawSide
-            );
-        };
-
-        return direction;
-    }
-
-    private ΩSolanaAddressΩ readPublicKey(
-            byte[] data,
-            int offset
-    ) {
-        byte[] publicKeyBytes = new byte[PUBLIC_KEY_LENGTH];
-
-        System.arraycopy(
-                data,
-                offset,
-                publicKeyBytes,
-                0,
-                PUBLIC_KEY_LENGTH
-        );
-
-        return base58.encode(publicKeyBytes);
-    }
-
-    private static final int ANCHOR_DISCRIMINATOR_LENGTH = 8;
-    private static final int PUBLIC_KEY_LENGTH = 32;
-    private static final int I64_LENGTH = 8;
-    private static final int SIDE_ENUM_LENGTH = 1;
-    private static final int U64_LENGTH = 8;
-
-    private static final int OWNER_OFFSET = ANCHOR_DISCRIMINATOR_LENGTH;
-    private static final int POOL_OFFSET = OWNER_OFFSET + PUBLIC_KEY_LENGTH;
-    private static final int CUSTODY_OFFSET = POOL_OFFSET + PUBLIC_KEY_LENGTH;
-    private static final int COLLATERAL_CUSTODY_OFFSET = CUSTODY_OFFSET + PUBLIC_KEY_LENGTH;
-    private static final int OPEN_TIME_OFFSET = COLLATERAL_CUSTODY_OFFSET + PUBLIC_KEY_LENGTH;
-    private static final int UPDATE_TIME_OFFSET = OPEN_TIME_OFFSET + I64_LENGTH;
-    private static final int SIDE_OFFSET = UPDATE_TIME_OFFSET + I64_LENGTH;
-    private static final int PRICE_OFFSET = SIDE_OFFSET + SIDE_ENUM_LENGTH;
-    private static final int SIZE_USD_OFFSET = PRICE_OFFSET + U64_LENGTH;
-    private static final int COLLATERAL_USD_OFFSET = SIZE_USD_OFFSET + U64_LENGTH;
-
-    private static final Base58Codec base58 = new Base58CodecImpl();
-}

src/main/tjava/com/r35157/libs/jupiter/perps/impl/anchoridl/AnchorIdlJupiterPerpsServiceImpl.tjava

@@ -1,172 +0,0 @@
-package com.r35157.libs.jupiter.perps.impl.anchoridl;
-
-import com.r35157.libs.jupiter.perps.JupiterPerpsPosition;
-import com.r35157.libs.jupiter.perps.JupiterPerpsService;
-import com.r35157.libs.solana.SolanaAccountInfo;
-import com.r35157.libs.solana.SolanaBlockChain;
-import com.r35157.libs.solana.SolanaProgramAccountMemcmpFilter;
-import com.r35157.libs.solana.valuetypes.WellKnownCurrencyTypes;
-import com.r35157.libs.valuetypes.basic.MoneyAmount;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.HashSet;
-import java.util.Set;
-
-import static java.math.BigDecimal.ZERO;
-
-public class AnchorIdlJupiterPerpsServiceImpl implements JupiterPerpsService {
-
-    public AnchorIdlJupiterPerpsServiceImpl(
-            SolanaBlockChain solanaBlockChain
-    ) {
-        this.solanaBlockChain = solanaBlockChain;
-        this.positionDecoder = new AnchorIdlJupiterPerpsPositionDecoder();
-        this.custodyDecoder = new AnchorIdlJupiterPerpsCustodyDecoder();
-    }
-
-    @Override
-    public @Nullable JupiterPerpsPosition getPosition(@NotNull ΩJupiterPerpsPositionAccountΩ positionAccount)
-            throws IOException, InterruptedException {
-        SolanaAccountInfo accountInfo = solanaBlockChain.getAccountInfo(positionAccount);
-
-        if (accountInfo == null) {
-            throw new IllegalArgumentException("Jupiter Perps position account does not exist: " + positionAccount);
-        }
-
-        if (!JUPITER_PERPS_PROGRAM_ID.equals(accountInfo.owner())) {
-            throw new IllegalArgumentException(
-                    "Account is not owned by Jupiter Perps program: " + positionAccount
-            );
-        }
-
-        ΩSPLMintAddressΩ tradedTokenMint = getTradedTokenMint(accountInfo);
-
-        JupiterPerpsPositionInfo info = positionDecoder.decode(accountInfo);
-
-        JupiterPerpsPosition pos;
-        if(info == null) {
-            pos = null;
-        } else {
-            ΩUSDCAmountΩ value = ZERO;             // TODO - Dummy
-            ΩUSDCAmountΩ pnl = ZERO;               // TODO - Dummy
-            BigDecimal pnlPercent = ZERO;          // TODO - Dummy
-            BigDecimal leverage = ZERO;            // TODO - Dummy
-            ΩUSDCPriceΩ marketPrice = ZERO;        // TODO - Dummy
-            ΩUSDCAmountΩ totalFees = ZERO;         // TODO - Dummy
-            ΩUSDCAmountΩ borrowFeesDue = ZERO;     // TODO - Dummy
-            ΩUSDCAmountΩ closeFeePending = ZERO;   // TODO - Dummy
-            ΩSolanaAmountΩ accountRent = new MoneyAmount(ZERO, WellKnownCurrencyTypes.SOLANA.getCurrencyType()); // TODO - Dummy
-
-            pos = new JupiterPerpsPosition(
-                    positionAccount,
-                    tradedTokenMint,
-                    info.direction(),
-                    value,
-                    info.sizeUsd(),
-                    pnl,
-                    pnlPercent,
-                    leverage,
-                    info.entryPrice(),
-                    marketPrice,
-                    info.collateralUsd(),
-                    totalFees,
-                    borrowFeesDue,
-                    closeFeePending,
-                    accountRent
-            );
-        }
-
-        return pos;
-    }
-
-    @Override
-    public @NotNull Set<JupiterPerpsPosition> getOpenPositions(@NotNull ΩSolanaWalletIdΩ owner)
-            throws IOException, InterruptedException {
-        Set<SolanaAccountInfo> accountInfos = solanaBlockChain.getProgramAccounts(
-                JUPITER_PERPS_PROGRAM_ID,
-                Set.of(new SolanaProgramAccountMemcmpFilter(
-                        POSITION_OWNER_OFFSET,
-                        owner
-                ))
-        );
-
-        Set<JupiterPerpsPosition> positions = new HashSet<>();
-
-        for (SolanaAccountInfo accountInfo : accountInfos) {
-            ΩSolanaProgramIdΩ programId = accountInfo.owner();
-            ΩJupiterPerpsPositionAccountΩ positionAccount = accountInfo.address();
-
-            if (!JUPITER_PERPS_PROGRAM_ID.equals(programId)) {
-                String errorMsg = "Account '" + positionAccount + "' is not owned by Jupiter Perps program '" +
-                        programId + "'";
-                throw new IllegalArgumentException(errorMsg);
-            }
-
-            JupiterPerpsPositionInfo info = positionDecoder.decode(accountInfo);
-            if(info == null || info.sizeUsd().compareTo(ZERO) == 0) {
-                continue;
-            }
-
-            ΩSPLMintAddressΩ tradedTokenMint = getTradedTokenMint(accountInfo);
-
-            ΩUSDCAmountΩ value = ZERO;             // TODO - Dummy
-            ΩUSDCAmountΩ pnl = ZERO;               // TODO - Dummy
-            BigDecimal pnlPercent = ZERO;          // TODO - Dummy
-            BigDecimal leverage = ZERO;            // TODO - Dummy
-            ΩUSDCPriceΩ marketPrice = ZERO;        // TODO - Dummy
-            ΩUSDCAmountΩ totalFees = ZERO;         // TODO - Dummy
-            ΩUSDCAmountΩ borrowFeesDue = ZERO;     // TODO - Dummy
-            ΩUSDCAmountΩ closeFeePending = ZERO;   // TODO - Dummy
-            ΩSolanaAmountΩ accountRent = new MoneyAmount(ZERO, WellKnownCurrencyTypes.SOLANA.getCurrencyType()); // TODO - Dummy
-
-            JupiterPerpsPosition pos = new JupiterPerpsPosition(
-                    positionAccount,
-                    tradedTokenMint,
-                    info.direction(),
-                    value,
-                    info.sizeUsd(),
-                    pnl,
-                    pnlPercent,
-                    leverage,
-                    info.entryPrice(),
-                    marketPrice,
-                    info.collateralUsd(),
-                    totalFees,
-                    borrowFeesDue,
-                    closeFeePending,
-                    accountRent
-            );
-
-            positions.add(pos);
-        }
-
-        return Set.copyOf(positions);
-    }
-
-    private ΩSPLMintAddressΩ getTradedTokenMint(SolanaAccountInfo positionAccountInfo)
-            throws IOException, InterruptedException
-    {
-        ΩSolanaAddressΩ custodyAccount = positionDecoder.decodeCustodyAccount(positionAccountInfo);
-        SolanaAccountInfo custodyAccountInfo = solanaBlockChain.getAccountInfo(custodyAccount);
-
-        if (custodyAccountInfo == null) {
-            throw new IllegalArgumentException(
-                    "Jupiter Perps custody account does not exist: " + custodyAccount
-            );
-        }
-
-        ΩSPLMintAddressΩ mintAddress = custodyDecoder.decodeMint(custodyAccountInfo);
-        return mintAddress;
-    }
-
-    private static final ΩJupiterPerpsProgramIdΩ JUPITER_PERPS_PROGRAM_ID =
-            "PERPHjGBqRHArX4DySjwM6UJHiR3sWAatqfdBS2qQJu";
-    private static final int POSITION_OWNER_OFFSET = 8;
-
-    private final SolanaBlockChain solanaBlockChain;
-    private final AnchorIdlJupiterPerpsPositionDecoder positionDecoder;
-    private final AnchorIdlJupiterPerpsCustodyDecoder custodyDecoder;
-}

src/main/tjava/com/r35157/libs/jupiter/perps/impl/anchoridl/JupiterPerpsPositionInfo.tjava

@@ -1,13 +0,0 @@
-package com.r35157.libs.jupiter.perps.impl.anchoridl;
-
-import com.r35157.libs.jupiter.perps.JupiterPerpsPositionDirection;
-
-import java.math.BigDecimal;
-
-public record JupiterPerpsPositionInfo(
-        ΩUSDCPriceΩ entryPrice,
-        JupiterPerpsPositionDirection direction,
-        ΩUSDCAmountΩ sizeUsd,
-        ΩUSDCAmountΩ collateralUsd
-) {
-}

src/main/tjava/com/r35157/libs/solana/SolanaBlockChain.tjava

@@ -143,25 +143,4 @@ public interface SolanaBlockChain {
             ΩSPLMintAddressΩ mintAddress,
             SolanaSPLTokenProgram splProgram
     ) throws IOException, InterruptedException;
-
-    /**
-     * Fetches accounts owned by a Solana program using server-side account data filters.
-     *
-     * <p>This method uses Solana's {@code getProgramAccounts} RPC call. The supplied filters
-     * are sent to the RPC node, so matching is performed server-side instead of fetching all
-     * accounts owned by the program and filtering them locally.</p>
-     *
-     * <p>The initial supported filter type is {@link SolanaProgramAccountMemcmpFilter}, which
-     * matches bytes at a specific offset in the account data.</p>
-     *
-     * @param programId the Solana program id that owns the accounts to search
-     * @param filters the memcmp filters to apply when searching program accounts
-     * @return the matching program accounts
-     * @throws IOException if the program accounts could not be fetched or parsed
-     * @throws InterruptedException if the calling thread is interrupted while fetching program accounts
-     */
-    Set<SolanaAccountInfo> getProgramAccounts(
-            ΩSolanaProgramIdΩ programId,
-            Set<SolanaProgramAccountMemcmpFilter> filters
-    ) throws IOException, InterruptedException;
 }

src/main/tjava/com/r35157/libs/solana/SolanaProgramAccountMemcmpFilter.tjava

@@ -1,17 +0,0 @@
-package com.r35157.libs.solana;
-
-/**
- * Filter used when fetching accounts owned by a Solana program.
- *
- * <p>The initial supported filter type is {@code memcmp}, which asks the
- * Solana RPC node to only return accounts where the account data at a specific
- * byte offset matches a base58 encoded value.</p>
- *
- * @param offset the byte offset in the account data where comparison starts
- * @param bytes the base58 encoded bytes to match
- */
-public record SolanaProgramAccountMemcmpFilter(
-        int offset,
-        String bytes
-) {
-}

src/main/tjava/com/r35157/libs/solana/impl/ref/SolanaBlockChainImpl.tjava

@@ -331,113 +331,6 @@ public class SolanaBlockChainImpl implements SolanaBlockChain {
         );
     }
 
-    @Override
-    public Set<SolanaAccountInfo> getProgramAccounts(
-            ΩSolanaProgramIdΩ programId,
-            Set<SolanaProgramAccountMemcmpFilter> filters
-    ) throws IOException, InterruptedException {
-        String jsonBody = createGetProgramAccountsBody(programId, filters);
-
-        HttpRequest request = HttpRequest.newBuilder()
-                .uri(URI.create(RPC_URL))
-                .header("Content-Type", "application/json")
-                .POST(HttpRequest.BodyPublishers.ofString(jsonBody))
-                .build();
-
-        HttpResponse<String> response = sendThrottled(request);
-
-        if (response.statusCode() != 200) {
-            throw new IOException("RPC call failed: HTTP " + response.statusCode() + "\n" + response.body());
-        }
-
-        JsonNode root = objectMapper.readTree(response.body());
-
-        if (root.has("error")) {
-            throw new IOException("Solana RPC error: " + root.get("error").toPrettyString());
-        }
-
-        JsonNode result = root.path("result");
-
-        if (!result.isArray()) {
-            throw new IOException("getProgramAccounts response did not contain result array!");
-        }
-
-        Set<SolanaAccountInfo> accountInfos = new HashSet<>();
-
-        for (JsonNode accountNode : result) {
-            JsonNode pubkeyNode = accountNode.path("pubkey");
-            JsonNode account = accountNode.path("account");
-
-            if (!pubkeyNode.isTextual()) {
-                throw new IOException("getProgramAccounts response contained account without textual pubkey!");
-            }
-
-            JsonNode ownerNode = account.path("owner");
-            if (!ownerNode.isTextual()) {
-                throw new IOException("getProgramAccounts response contained account without textual owner!");
-            }
-
-            JsonNode dataNode = account.path("data");
-            if (!dataNode.isArray() || dataNode.isEmpty() || !dataNode.get(0).isTextual()) {
-                throw new IOException("getProgramAccounts response contained account without base64 data!");
-            }
-
-            accountInfos.add(new SolanaAccountInfo(
-                    pubkeyNode.asText(),
-                    ownerNode.asText(),
-                    dataNode.get(0).asText()
-            ));
-        }
-
-        return Set.copyOf(accountInfos);
-    }
-
-    private String createGetProgramAccountsBody(
-            ΩSolanaProgramIdΩ programId,
-            Set<SolanaProgramAccountMemcmpFilter> filters
-    ) throws IOException {
-        StringBuilder filtersJson = new StringBuilder();
-
-        boolean first = true;
-        for (SolanaProgramAccountMemcmpFilter filter : filters) {
-            if (!first) {
-                filtersJson.append(",");
-            }
-
-            filtersJson.append("""
-                {
-                    "memcmp": {
-                        "offset": %d,
-                        "bytes": "%s"
-                    }
-                }
-                """.formatted(
-                    filter.offset(),
-                    filter.bytes()
-            ));
-
-            first = false;
-        }
-
-        return """
-            {
-                "jsonrpc": "2.0",
-                "id": 1,
-                "method": "getProgramAccounts",
-                "params": [
-                    "%s",
-                    {
-                        "commitment": "finalized",
-                        "encoding": "base64",
-                        "filters": [
-                            %s
-                        ]
-                    }
-                ]
-            }
-            """.formatted(programId, filtersJson);
-    }
-
     private synchronized HttpResponse<String> sendThrottled(HttpRequest request) throws IOException, InterruptedException {
         waitBeforeRemoteCall();
 

src/main/tjava/com/r35157/libs/solana/valuetypes/WellKnownCurrencyTypes.tjava

@@ -1,52 +0,0 @@
-package com.r35157.libs.solana.valuetypes;
-
-import com.r35157.libs.valuetypes.basic.CurrencyType;
-
-import java.util.UUID;
-
-/**
- * Defines well-known currency types used by the Solana integration.
- *
- * <p>Each enum value wraps a {@link CurrencyType} with a stable identifier and a
- * human-readable currency name. These predefined values are intended for common
- * currencies that the Solana-related modules need to reference consistently.</p>
- */
-public enum WellKnownCurrencyTypes {
-    /**
-     * Native Solana currency.
-     */
-    SOLANA(new CurrencyType(
-            UUID.fromString("019e0116-fce5-792f-a647-fa6da4dffec5"),
-            "Solana",
-            "SOL")
-    ),
-
-    /**
-     * Syrup USDC token currency.
-     */
-    SYRUPUSDC(new CurrencyType(
-            UUID.fromString("019e1d51-0600-7956-8231-f3b7058a91c2"),
-            "SyrupUSDC",
-            "SyrupUSDC")
-    );
-
-    /**
-     * Creates a well-known currency type entry.
-     *
-     * @param currencyType the currency type represented by this enum value
-     */
-    WellKnownCurrencyTypes(CurrencyType currencyType) {
-        this.currencyType = currencyType;
-    }
-
-    /**
-     * Returns the currency type represented by this enum value.
-     *
-     * @return the represented currency type
-     */
-    public CurrencyType getCurrencyType() {
-        return currencyType;
-    }
-
-    private final CurrencyType currencyType;
-}

src/main/tjava/com/r35157/libs/valuetypes/basic/MoneyPrice.tjava

@@ -1,8 +0,0 @@
-package com.r35157.libs.valuetypes.basic;
-
-import java.math.BigDecimal;
-
-public record MoneyPrice(
-        ΩPriceΩ price,
-        CurrencyType currencyType
-) { }

src/main/tjava/com/r35157/nenjim/hubd/impl/ref/Main.tjava

@@ -1,10 +1,5 @@
 package com.r35157.nenjim.hubd.impl.ref;
 
-import com.r35157.libs.jupiter.perps.JupiterPerpsPosition;
-import com.r35157.libs.jupiter.perps.JupiterPerpsService;
-import com.r35157.libs.jupiter.perps.impl.anchoridl.AnchorIdlJupiterPerpsServiceImpl;
-import com.r35157.libs.solana.SolanaBlockChain;
-import com.r35157.libs.solana.impl.ref.SolanaBlockChainImpl;
 import com.r35157.nenjim.hubd.ctx.Context;
 import com.r35157.nenjim.hubd.NenjimHub;
 import org.slf4j.Logger;
@@ -17,21 +12,12 @@ import com.r35157.nenjim.hubd.journal.JournalManager;
 import com.r35157.nenjim.hubd.impl.ref.JournalManagerImpl;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Set;
 
 public class Main {
 
     // TODO: Consider if we really need a Main class or we just need to move the main method to NenjimHubImpl?
     static void main(String[] args) throws Exception {
         NenjimHubImpl nenjimHub = new NenjimHubImpl();
-
-        /*
-        SolanaBlockChain sbc = new SolanaBlockChainImpl();
-        JupiterPerpsService jupiter = new AnchorIdlJupiterPerpsServiceImpl(sbc);
-        ΩSolanaWalletIdΩ walletId = "vj98roDZ7744EBfxyuDFkKpEGCsKQLr7K8UFRumJNHf";
-        Set<JupiterPerpsPosition> positions = jupiter.getOpenPositions(walletId);
-        int a=0;
-        */
         nenjimHub.awaitShutdown();
 
         /*        try {