strfry bug free version

api/nostr.py

@@ -57,7 +57,11 @@ def generate_tags(self, order, robot_name, currency):
             Tag.parse(["f", currency]),
             Tag.parse(["s", self.get_status_tag(order)]),
             Tag.parse(["amt", "0"]),
-            Tag.parse(["fa", str(order.amount)]),
+            Tag.parse(
+                ["fa"] + [str(order.amount)]
+                if not order.has_range
+                else [str(order.min_amount), str(order.max_amount)]
+            ),
             Tag.parse(["pm"] + order.payment_method.split(" ")),
             Tag.parse(["premium", str(order.premium)]),
             Tag.parse(

docker/strfry/Dockerfile

@@ -1,18 +1,41 @@
-FROM dockurr/strfry:0.9.6
+FROM ubuntu:jammy
+ENV TZ=Europe/London
 
-RUN apk add --no-cache torsocks
+RUN apt update && apt install -y --no-install-recommends \
+    git g++ make pkg-config libtool ca-certificates \
+    libssl-dev zlib1g-dev liblmdb-dev libflatbuffers-dev \
+    libsecp256k1-dev libzstd-dev
+
+# setup app
+RUN git clone https://github.com/KoalaSat/strfry /app
+
+WORKDIR /app
+
+RUN git submodule update --init
+RUN make setup-golpe
+RUN make clean
+RUN make -j4
+
+RUN apt update && apt install -y --no-install-recommends \
+    liblmdb0 libflatbuffers1 libsecp256k1-0 libb2-1 libzstd1 torsocks cron\
+    && rm -rf /var/lib/apt/lists/*
 
 RUN echo "TorAddress 127.0.0.1" >> /etc/tor/torsocks.conf
 RUN echo "TorPort 9050" >> /etc/tor/torsocks.conf
 
 # Setting up crontab
-COPY crontab /tmp/crontab
-RUN cat /tmp/crontab > /etc/crontabs/root
+COPY crontab /etc/cron.d/crontab
+RUN chmod 0644 /etc/cron.d/crontab
+RUN crontab /etc/cron.d/crontab
 
+# Setting up entrypoints
 COPY sync.sh /etc/strfry/sync.sh
 COPY entrypoint.sh /etc/strfry/entrypoint.sh
 
 RUN chmod +x /etc/strfry/entrypoint.sh
 RUN chmod +x /etc/strfry/sync.sh
 
+#Setting up logs
+RUN touch /var/log/cron.log && chmod 0644 /var/log/cron.log
+
 ENTRYPOINT ["/etc/strfry/entrypoint.sh"]

docker/strfry/crontab

@@ -21,4 +21,4 @@
 # For more information see the manual pages of crontab(5) and cron(8)
 #
 # m h  dom mon dow   command
-*/1 * * * * torsocks /etc/strfry/sync.sh
+*/1 * * * * torsocks /etc/strfry/sync.sh >> /var/log/cron.log 2>&1

docker/strfry/entrypoint.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-crond -f -l 8 & /app/strfry.sh
+cron -f -l 8 & tail -f /var/log/cron.log & /app/strfry relay