From 4576331a5f04afb84eb8904f4c7672e1b23609b8 Mon Sep 17 00:00:00 2001
From: Sachin Kamath <github@skamath.me>
Date: Tue, 6 May 2025 21:18:35 +0530
Subject: [PATCH] cleanup psql fork for push

---
 Cargo.lock                                    | 30 +++++++++++++++++++
 Cargo.toml                                    |  1 +
 common/nyxd-scraper-psql/Cargo.toml           |  2 +-
 common/nyxd-scraper-psql/Dockerfile           |  7 +++++
 common/nyxd-scraper-psql/callisto             |  1 -
 common/nyxd-scraper-psql/docker-compose.yml   | 15 ++++++++++
 .../nyxd-scraper-psql/src/storage/manager.rs  |  9 ++----
 7 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 common/nyxd-scraper-psql/Dockerfile
 delete mode 160000 common/nyxd-scraper-psql/callisto
 create mode 100644 common/nyxd-scraper-psql/docker-compose.yml

diff --git a/Cargo.lock b/Cargo.lock
index eb92d1ccc0..5c4fb962b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7061,12 +7061,42 @@ name = "nyxd-scraper"
 version = "0.1.0"
 dependencies = [
  "async-trait",
+ "base64 0.22.1",
+ "chrono",
  "const_format",
  "cosmrs 0.17.0-pre",
  "eyre",
  "futures",
  "humantime 2.1.0",
  "serde",
+ "serde_json",
+ "sha2 0.10.8",
+ "sqlx",
+ "tendermint 0.37.0",
+ "tendermint-rpc",
+ "thiserror",
+ "time",
+ "tokio",
+ "tokio-stream",
+ "tokio-util",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "nyxd-scraper-psql"
+version = "0.1.0"
+dependencies = [
+ "async-trait",
+ "base64 0.22.1",
+ "chrono",
+ "const_format",
+ "cosmrs 0.17.0-pre",
+ "eyre",
+ "futures",
+ "humantime 2.1.0",
+ "serde",
+ "serde_json",
  "sha2 0.10.8",
  "sqlx",
  "tendermint 0.37.0",
diff --git a/Cargo.toml b/Cargo.toml
index 9ddde74297..139a81f074 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -79,6 +79,7 @@ members = [
     "common/nymsphinx/routing",
     "common/nymsphinx/types",
     "common/nyxd-scraper",
+    "common/nyxd-scraper-psql",
     "common/pemstore",
     "common/serde-helpers",
     "common/service-provider-requests-common",
diff --git a/common/nyxd-scraper-psql/Cargo.toml b/common/nyxd-scraper-psql/Cargo.toml
index 8266c23262..595ae9cdfe 100644
--- a/common/nyxd-scraper-psql/Cargo.toml
+++ b/common/nyxd-scraper-psql/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "nyxd-scraper"
+name = "nyxd-scraper-psql"
 version = "0.1.0"
 authors.workspace = true
 repository.workspace = true
diff --git a/common/nyxd-scraper-psql/Dockerfile b/common/nyxd-scraper-psql/Dockerfile
new file mode 100644
index 0000000000..69c605d6e1
--- /dev/null
+++ b/common/nyxd-scraper-psql/Dockerfile
@@ -0,0 +1,7 @@
+FROM postgres:latest
+
+ENV POSTGRES_USER=nym
+ENV POSTGRES_PASSWORD=password123
+ENV POSTGRES_DB=nyxd_scraper
+
+EXPOSE 5432 
\ No newline at end of file
diff --git a/common/nyxd-scraper-psql/callisto b/common/nyxd-scraper-psql/callisto
deleted file mode 160000
index 868bbd5cbb..0000000000
--- a/common/nyxd-scraper-psql/callisto
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 868bbd5cbb8804f25102b9042b8974c7dc71ce52
diff --git a/common/nyxd-scraper-psql/docker-compose.yml b/common/nyxd-scraper-psql/docker-compose.yml
new file mode 100644
index 0000000000..954a953d07
--- /dev/null
+++ b/common/nyxd-scraper-psql/docker-compose.yml
@@ -0,0 +1,15 @@
+version: '3.8'
+services:
+  postgres:
+    image: postgres:latest
+    environment:
+      POSTGRES_USER: nym
+      POSTGRES_PASSWORD: password123
+      POSTGRES_DB: nyxd_scraper
+    ports:
+      - "5432:5432"
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+
+volumes:
+  postgres_data:
\ No newline at end of file
diff --git a/common/nyxd-scraper-psql/src/storage/manager.rs b/common/nyxd-scraper-psql/src/storage/manager.rs
index 1fb9ae4d06..dd657383b4 100644
--- a/common/nyxd-scraper-psql/src/storage/manager.rs
+++ b/common/nyxd-scraper-psql/src/storage/manager.rs
@@ -549,12 +549,9 @@ where
     trace!("prune_transactions");
     let start = Instant::now();
 
-    sqlx::query!(
-        "DELETE FROM transaction WHERE height < $1",
-        oldest_to_keep
-    )
-    .execute(executor)
-    .await?;
+    sqlx::query!("DELETE FROM transaction WHERE height < $1", oldest_to_keep)
+        .execute(executor)
+        .await?;
     log_db_operation_time("prune_transactions", start);
 
     Ok(())