Merge pull request #208 from p2pderivatives/fix/docker-postgres-db

Fix postgres db issue in docker compose for oracle

docker-compose.yml

@@ -46,7 +46,10 @@ services:
       - ./testconfig/oracle/certs/oracle:/key
 
   oracle-db:
-    image: "postgres:12.2"
+    image: oracledb:latest
+    build:
+      context: .
+      dockerfile: ./testconfig/oracle/oracledb.dockerfile
     profiles: [oracle]
     command: |
       -c log_statement=all
@@ -62,7 +65,6 @@ services:
       - POSTGRES_DB=db
     volumes:
       - oracle-db-data:/var/lib/postgresql/data/ # persist data even if container shuts down
-      - ./testconfig/oracle/certs/db:/certs
 
 
 volumes:

p2pd-oracle-client/src/lib.rs

@@ -18,7 +18,7 @@ extern crate reqwest;
 extern crate secp256k1_zkp;
 extern crate serde;
 
-use chrono::{DateTime, NaiveDateTime, SecondsFormat, Utc};
+use chrono::{DateTime, SecondsFormat, Utc};
 use dlc_manager::error::Error as DlcManagerError;
 use dlc_manager::Oracle;
 use dlc_messages::oracle_msgs::{OracleAnnouncement, OracleAttestation};
@@ -130,9 +130,14 @@ fn parse_event_id(event_id: &str) -> Result<(String, DateTime<Utc>), DlcManagerE
     let timestamp: i64 = timestamp_str
         .parse()
         .map_err(|_| DlcManagerError::OracleError("Invalid timestamp format".to_string()))?;
-    let naive_date_time = NaiveDateTime::from_timestamp_opt(timestamp, 0).ok_or_else(|| {
-        DlcManagerError::InvalidParameters(format!("Invalid timestamp {} in event id", timestamp))
-    })?;
+    let naive_date_time = DateTime::from_timestamp(timestamp, 0)
+        .ok_or_else(|| {
+            DlcManagerError::InvalidParameters(format!(
+                "Invalid timestamp {} in event id",
+                timestamp
+            ))
+        })?
+        .naive_utc();
     let date_time = DateTime::from_naive_utc_and_offset(naive_date_time, Utc);
     Ok((asset_id.to_string(), date_time))
 }

testconfig/oracle/oracledb.dockerfile

@@ -0,0 +1,9 @@
+FROM postgres:16.2
+
+RUN mkdir certs
+COPY ./testconfig/oracle/certs/db/db.crt /certs/
+COPY ./testconfig/oracle/certs/db/db.key /certs/
+RUN chmod 600 /certs/db.key
+RUN chown postgres /certs/db.key
+
+CMD ["postgres"]