Merge remote-tracking branch 'origin/v4-dev' into v4-beta

apps/itchysats/app.yml

@@ -0,0 +1,63 @@
+# yaml-language-server: $schema=../../app-standard-v4.yml
+
+citadel_version: 4
+
+metadata:
+  name: ItchySats
+  version: 0.6.1
+  category: Finance
+  tagline: Peer-2-peer derivatives on Bitcoin
+  developers:
+    ItchySats: https://itchysats.network
+  permissions:
+  - electrum
+  repo:
+    Public: https://github.com/itchysats/itchysats
+  support: https://github.com/itchysats/itchysats/issues
+  gallery:
+  - 1.jpg
+  - 2.jpg
+  - 3.jpg
+  defaultPassword: $APP_SEED
+  torOnly: false
+  description: |-
+    ItchySats enables peer-2-peer CFD trading on Bitcoin using DLCs (discreet log contracts). No account needed, no trusted third-party - just you and your keys.
+
+    This is beta software. We tested it on test- and mainnet, but there are no guarantees that it will always behave as expected.
+    Please be mindful with how much money you trust the application with.
+    CFDs trading is inherently risky, be sure to read up on it before using this application.
+
+    That said: This is pretty awesome, go nuts!
+
+    1. Fund the ItchySats wallet
+    2. Open a position
+    3. Monitor the price movement
+    4. Profit
+
+    Limitations of the mainnet beta:
+
+    1. Minimum position quantity is $100, maximum $1000
+
+    With 0.4.0 your CFDs are perpetual positions that are extended hourly. This means your CFD position will remain open forever unless you decide to close it. A funding fee is collected hourly when the CFD is extended.
+
+    With 0.4.8 you can open long and short positions, previously only long positions were possible.
+
+    With 0.5.0 you can chose from different from leverage. Leverage choices are configured by the maker and might initially be restricted to x1, x2 and x3.
+
+    With 0.6.0 you can open positions on BTCUSD and ETHUSD prices. #ShortTheMerge
+services:
+  main:
+    image: ghcr.io/itchysats/itchysats/taker:0.6.1@sha256:5ad0baea350bee41b6e828030ff37f7bb61359d381c7afd15f874ee2bf9d6c62
+    stop_grace_period: 1m
+    restart: on-failure
+    command:
+    - --password=$APP_SEED
+    - --umbrel-seed=$APP_SEED_2
+    - $BITCOIN_NETWORK
+    - --electrum=tcp://$ELECTRUM_IP:$ELECTRUM_PORT
+    environment:
+      ITCHYSATS_ENV: citadel
+    port: 8000
+    mounts:
+      data:
+        data: /data

apps/jam/app.yml

@@ -9,7 +9,7 @@ citadel_version: 4
 metadata:
   category: Wallets
   name: JAM
-  version: 0.0.10
+  version: 0.1.0
   tagline: JoinMarket's awesome, man
   description: JAM (JoinMarket's awesome, man) is a web-interface for JoinMarket
     with focus on user-friendliness. It's time for top-notch privacy for your
@@ -33,7 +33,7 @@ metadata:
 
 services:
   main:
-    image: ghcr.io/joinmarket-webui/joinmarket-webui-standalone:v0.0.10-clientserver-v0.9.6
+    image: ghcr.io/joinmarket-webui/jam-standalone:v0.1.0-clientserver-v0.9.8
     restart: on-failure
     stop_grace_period: 1m
     init: true