Review comments

compose/docker-compose-db.yml

@@ -17,7 +17,6 @@ services:
   ipld-eth-db:
     image: timescale/timescaledb:latest-pg14
     restart: always
-    command: ["postgres", "-c", "log_statement=all"]
     environment:
       POSTGRES_USER: "vdbm"
       POSTGRES_DB: "cerc_testing"

compose/docker-compose-fixturenet-eth.yml

@@ -22,8 +22,8 @@ services:
   fixturenet-eth-geth-2:
     hostname: fixturenet-eth-geth-2
     environment:
-      RUN_STATEDIFF: "true"
-      STATEDIFF_DB_NODE_ID: 2
+      CERC_RUN_STATEDIFF: "true"
+      CERC_STATEDIFF_DB_NODE_ID: 2
     env_file:
       - ../config/fixturenet-eth/fixturenet-eth.env
     image: cerc/fixturenet-eth-geth:local

config/fixturenet-eth/fixturenet-eth.env

@@ -11,8 +11,8 @@ JWT="0x6cdcac3501046a08e186730dd8bd136cfaf0fdc1fc955f6e15ad3068c0ff2af0"
 ENR_URL="http://fixturenet-eth-bootnode-lighthouse:3000/bootnode/enr.dat"
 
 # DB connection settings for statediffing (see docker-compose-db.yml)
-STATEDIFF_DB_HOST="ipld-eth-db"
-STATEDIFF_DB_PORT=5432
-STATEDIFF_DB_NAME="cerc_testing"
-STATEDIFF_DB_USER="vdbm"
-STATEDIFF_DB_PASSWORD="password"
+CERC_STATEDIFF_DB_HOST="ipld-eth-db"
+CERC_STATEDIFF_DB_PORT=5432
+CERC_STATEDIFF_DB_NAME="cerc_testing"
+CERC_STATEDIFF_DB_USER="vdbm"
+CERC_STATEDIFF_DB_PASSWORD="password"

container-build/cerc-fixturenet-eth-geth/run-el.sh

@@ -18,14 +18,14 @@ else
     echo -n "$JWT" > /opt/testnet/build/el/jwtsecret
 
     STATEDIFF_OPTS=""
-    if [ "$RUN_STATEDIFF" == "true" ]; then
+    if [ "$CERC_RUN_STATEDIFF" == "true" ]; then
       STATEDIFF_OPTS="--statediff=true \
-      --statediff.db.host=$STATEDIFF_DB_HOST \
-      --statediff.db.name=$STATEDIFF_DB_NAME \
-      --statediff.db.nodeid=$STATEDIFF_DB_NODE_ID \
-      --statediff.db.password=$STATEDIFF_DB_PASSWORD \
-      --statediff.db.port=$STATEDIFF_DB_PORT \
-      --statediff.db.user=$STATEDIFF_DB_USER \
+      --statediff.db.host=$CERC_STATEDIFF_DB_HOST \
+      --statediff.db.name=$CERC_STATEDIFF_DB_NAME \
+      --statediff.db.nodeid=$CERC_STATEDIFF_DB_NODE_ID \
+      --statediff.db.password=$CERC_STATEDIFF_DB_PASSWORD \
+      --statediff.db.port=$CERC_STATEDIFF_DB_PORT \
+      --statediff.db.user=$CERC_STATEDIFF_DB_USER \
       --statediff.waitforsync=true \
       --statediff.writing=true"
     fi