From d2699e33262a379936b40ee735bb4e541ddce6d1 Mon Sep 17 00:00:00 2001
From: Arseniy Klempner <arseniyk@status.im>
Date: Sat, 11 Oct 2025 22:51:58 -0700
Subject: [PATCH] fix: use separate db (same instance) for each node

---
 packages/run/docker-compose.yml | 5 +++--
 packages/run/init-db.sh         | 8 ++++++++
 packages/run/package.json       | 1 +
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100755 packages/run/init-db.sh

diff --git a/packages/run/docker-compose.yml b/packages/run/docker-compose.yml
index 807654bf14..9a753c15f2 100644
--- a/packages/run/docker-compose.yml
+++ b/packages/run/docker-compose.yml
@@ -27,6 +27,7 @@ services:
       POSTGRES_DB: postgres
     volumes:
       - postgres-data:/var/lib/postgresql/data
+      - ./init-db.sh:/docker-entrypoint-initdb.d/init-db.sh
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U postgres"]
       interval: 10s
@@ -77,7 +78,7 @@ services:
       - --rest-address=0.0.0.0
       - --rest-port=8646
       - --rest-admin=true
-      - --store-message-db-url=postgresql://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-test123}@postgres:5432/postgres
+      - --store-message-db-url=postgresql://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-test123}@postgres:5432/nwaku1
       - --log-level=${LOG_LEVEL:-INFO}
       - --max-connections=150
 
@@ -126,7 +127,7 @@ services:
       - --rest-address=0.0.0.0
       - --rest-port=8647
       - --rest-admin=true
-      - --store-message-db-url=postgresql://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-test123}@postgres:5432/postgres
+      - --store-message-db-url=postgresql://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-test123}@postgres:5432/nwaku2
       - --log-level=${LOG_LEVEL:-INFO}
       - --max-connections=150
 
diff --git a/packages/run/init-db.sh b/packages/run/init-db.sh
new file mode 100755
index 0000000000..35a95a7560
--- /dev/null
+++ b/packages/run/init-db.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+# Create separate databases for each nwaku node
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" <<-EOSQL
+    CREATE DATABASE nwaku1;
+    CREATE DATABASE nwaku2;
+EOSQL
diff --git a/packages/run/package.json b/packages/run/package.json
index 9daa29138e..8ce883e4fe 100644
--- a/packages/run/package.json
+++ b/packages/run/package.json
@@ -27,6 +27,7 @@
   "files": [
     "dist",
     "docker-compose.yml",
+    "init-db.sh",
     "README.md"
   ],
   "scripts": {