20: Update PriceAlarmDefinition to support expressions

conf/alarms.conf.example

@@ -1,8 +1,56 @@
+# General configurations
+#####################################################
+{{JUPITER_PERPS_WALLET}}  8abcYourWalletAddressHere
+
+
+# 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
-######################################################################################################################
+###############################################################################################################################
-1      SOL     ABOVE       97.03-1.25%   ONETIME   CRITICAL   "CRITICAL: Risiko for Perps Solana short LIKVIDERING!"
+
-2      SOL     BELOW       48.72+1.25%   ONETIME   CRITICAL   "CRITICAL: Risiko for Perps Solana long LIKVIDERING!"
+# SOL SHORT
-3      BTC     ABOVE       85032.87-1%   ONETIME   CRITICAL   "CRITICAL: Risiko for Perps Bitcoin short LIKVIDERING!"
+1      SOL     ABOVE       {{SOL_SHORT_LIQ_PRICE}}-1.25%   ONETIME           CRITICAL   "🚨 LIKVIDERINGS-risiko SOL Short!"
-4      BTC     BELOW       42779.40+1%   ONETIME   CRITICAL   "CRITICAL: Risiko for Perps Bitcoin long LIKVIDERING!"
+2      SOL     ABOVE        {{SOL_SHORT_ENTRY_PRICE}}+3%   PERSISTENT:900   INFO       "🌱 Short SOL now"
-5      ETH     ABOVE        2296.13-1%   ONETIME   CRITICAL   "CRITICAL: Risiko for Perps Ethereum short LIKVIDERING!"
+3      SOL     BELOW        {{SOL_SHORT_ENTRY_PRICE}}-3%   PERSISTENT:900   INFO       "💵 Close SOL Short"
-6      ETH     BELOW        1155.19+1%   ONETIME   CRITICAL   "CRITICAL: Risiko for Perps Ethereum long LIKVIDERING!"
+
+# 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

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+SOURCE="$HOME/projects/com_r35157_nenjim-hubd-impl_ref"
+TARGET="$HOME/projects/com_r35157_nenjim-hubd-impl_ref_github_snapshot"
+
+rsync -a --delete \
+  --exclude '.git' \
+  --exclude 'conf/*.conf' \
+  --exclude 'conf/*.xml' \
+  "$SOURCE/" \
+  "$TARGET/"
+
+cd "$TARGET"
+git add -A
+
+if git diff --cached --quiet; then
+    echo "No snapshot changes to publish."
+    exit 0
+fi
+
+git commit -m "Mirror snapshot"
+git push

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

@@ -2,14 +2,13 @@ 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,
-        BigDecimal target,
+        String targetExpression,
         AlarmTrigger trigger,
         ΩsecondsΩ triggerGracePeriod,
         AlarmSeverity severity,
@@ -18,12 +17,13 @@ public record PriceAlarmDefinition(
     public PriceAlarmDefinition {
         Objects.requireNonNull(asset, "asset");
         Objects.requireNonNull(direction, "direction");
-        Objects.requireNonNull(target, "target");
+        Objects.requireNonNull(targetExpression, "targetExpression");
         Objects.requireNonNull(trigger, "trigger");
+        Objects.requireNonNull(severity, "severity");
         Objects.requireNonNull(note, "note");
 
-        if (target.signum() < 0) {
+        if (targetExpression.isBlank()) {
-            throw new IllegalArgumentException("Target price cannot be negative (was: " + target.signum() + ")!");
+            throw new IllegalArgumentException("Target expression cannot be blank");
         }
 
         if (triggerGracePeriod < 0) {