Merge pull request #787 from BoltzExchange/cleanup-fixes

Minor fixes
BoltzExchange · Jan 15, 2025 · 0bca75a · 0bca75a
2 parents 5d16749 + 287257f
commit 0bca75a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,14 +1,14 @@
 name: CI
 
-on: [ push, pull_request ]
+on: [push, pull_request]
 
 jobs:
   build:
     strategy:
       matrix:
-        platform: [ ubuntu-latest ]
-        node-version: [ 20 ]
-        rust-version: [ stable ]
+        platform: [ubuntu-latest]
+        node-version: [20]
+        rust-version: [stable]
 
     runs-on: ${{ matrix.platform }}
 
@@ -33,7 +33,9 @@ jobs:
           matrix.rust-version }}
 
       - name: Install build dependencies
-        run: sudo apt-get update && sudo apt-get -y install protobuf-compiler
+        run:
+          sudo apt-get update && sudo apt-get -y install protobuf-compiler
+          libsqlite3-dev
 
       - name: Install Node.js dependencies
         run: npm ci
@@ -80,9 +82,9 @@ jobs:
   build-rust:
     strategy:
       matrix:
-        platform: [ ubuntu-latest ]
-        node-version: [ 20 ]
-        rust-version: [ stable, nightly ]
+        platform: [ubuntu-latest]
+        node-version: [20]
+        rust-version: [stable, nightly]
 
     runs-on: ${{ matrix.platform }}
 

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -3,7 +3,7 @@ name: Docker
 on:
   workflow_dispatch:
   push:
-    branches: ["master"]
+    branches: ['master']
 
 jobs:
   push:
@@ -29,4 +29,6 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Push backend image
-        run: ./docker/build.py buildx --platform linux/amd64 --no-latest --branch ${GITHUB_REF##*/} boltz
+        run:
+          ./docker/build.py buildx --platform linux/amd64 --no-latest --branch
+          ${GITHUB_REF##*/} boltz
diff --git a/boltzr/src/profiling.rs b/boltzr/src/profiling.rs
@@ -2,7 +2,7 @@ use crate::config::GlobalConfig;
 use pyroscope::pyroscope::PyroscopeAgentRunning;
 use pyroscope::PyroscopeAgent;
 use pyroscope_pprofrs::{pprof_backend, PprofConfig};
-use tracing::{error, warn};
+use tracing::{error, info, warn};
 
 pub fn start(config: &GlobalConfig) -> Option<PyroscopeAgent<PyroscopeAgentRunning>> {
     let endpoint = match &config.profiling_endpoint {
@@ -24,7 +24,10 @@ pub fn start(config: &GlobalConfig) -> Option<PyroscopeAgent<PyroscopeAgentRunni
 
     let err = match agent {
         Ok(agent) => match agent.start() {
-            Ok(agent) => return Some(agent),
+            Ok(agent) => {
+                info!("Enabling profiler");
+                return Some(agent);
+            }
             Err(err) => err,
         },
         Err(err) => err,

diff --git a/lib/db/repositories/StatsRepository.ts b/lib/db/repositories/StatsRepository.ts
@@ -159,13 +159,13 @@ ORDER BY year, month, pair NULLS FIRST;
     // language=PostgreSQL
     `
 WITH data AS (
-    SELECT pair, 'submarine' AS type, status, referral, "createdAt"
+    SELECT pair, 'submarine' AS type, status, "failureReason", referral, "createdAt"
     FROM swaps
     UNION ALL
-    SELECT pair, 'reverse' AS type, status, referral, "createdAt"
+    SELECT pair, 'reverse' AS type, status, "failureReason",referral, "createdAt"
     FROM "reverseSwaps"
     UNION ALL
-    SELECT pair, 'chain' AS type, status, referral, "createdAt"
+    SELECT pair, 'chain' AS type, status, "failureReason", referral, "createdAt"
     FROM "chainSwaps"
 )
 SELECT
@@ -174,6 +174,7 @@ SELECT
     type,
     COUNT(*) FILTER (
         WHERE status IN (?)
+          AND "failureReason" NOT IN (?)
     ) / CAST(COUNT(*) AS REAL) AS "failureRate"
 FROM data
 WHERE
@@ -389,6 +390,7 @@ GROUP BY pair, type;
           SwapUpdateEvent.InvoiceFailedToPay,
           SwapUpdateEvent.TransactionRefunded,
         ],
+        ['invoice expired', 'swap expired'],
         referral,
         referral,
         minYear,