adds pubkey for creating entries

oracle/Cargo.toml

@@ -39,7 +39,12 @@ rustix = "0.38.19"
 scooby = "0.5.0"
 serde = { version = "1.0.188", features = ["derive"] }
 serde_json = "1.0.117"
-time = { version = "0.3.36", features = ["parsing", "formatting", "macros"] }
+time = { version = "0.3.36", features = [
+    "parsing",
+    "formatting",
+    "macros",
+    "serde",
+] }
 thiserror = "1.0.62"
 tokio = { version = "1.35.1", features = [
     "macros",

oracle/src/db/event_data.rs

@@ -372,6 +372,10 @@ impl EventData {
             .collect();
 
         info!("insert values: {:?}", insert_values);
+        if insert_values.is_empty() {
+            debug!("entry values were emtpy, skipping creating entry");
+            return Ok(());
+        }
 
         let conn = self.new_write_connection_retry().await?;
         let mut weather_stmt = conn.prepare(&query_str)?;

oracle/src/db/mod.rs

@@ -1,7 +1,7 @@
 use anyhow::anyhow;
-use dlctix::bitcoin::hashes::sha256;
+use dlctix::bitcoin::{hashes::sha256, XOnlyPublicKey};
 use dlctix::musig2::secp256k1::schnorr::Signature;
-use dlctix::musig2::secp256k1::{self, Message, PublicKey};
+use dlctix::musig2::secp256k1::{Message, PublicKey};
 use dlctix::secp::{MaybeScalar, Scalar};
 use dlctix::EventAnnouncement;
 use duckdb::arrow::datatypes::ToByteSlice;
@@ -23,16 +23,14 @@ pub use event_data::*;
 pub use event_db_migrations::*;
 pub use weather_data::{Forecast, Observation, Station, WeatherData};
 
-use crate::utc_datetime;
-
 #[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
 pub struct CreateEvent {
     /// Client needs to provide a valid Uuidv7
     pub id: Uuid,
-    #[serde(with = "utc_datetime")]
+    #[serde(with = "time::serde::rfc3339")]
     /// Time at which the attestation will be added to the event, needs to be after the observation date
     pub signing_date: OffsetDateTime,
-    #[serde(with = "utc_datetime")]
+    #[serde(with = "time::serde::rfc3339")]
     /// Date of when the weather observations occured (midnight UTC), all entries must be made before this time
     pub observation_date: OffsetDateTime,
     /// NOAA observation stations used in this event
@@ -51,10 +49,10 @@ pub struct CreateEvent {
 pub struct CreateEventMessage {
     /// Client needs to provide a valid Uuidv7
     pub id: Uuid,
-    #[serde(with = "utc_datetime")]
+    #[serde(with = "time::serde::rfc3339")]
     /// Time at which the attestation will be added to the event, needs to be after the observation date
     pub signing_date: OffsetDateTime,
-    #[serde(with = "utc_datetime")]
+    #[serde(with = "time::serde::rfc3339")]
     /// Date of when the weather observations occured (midnight UTC), all entries must be made before this time
     pub observation_date: OffsetDateTime,
     /// NOAA observation stations used in this event
@@ -101,10 +99,10 @@ pub struct CoordinatorInfo {
 pub struct CreateEventData {
     /// Provide UUIDv7 to use for looking up the event
     pub id: Uuid,
-    #[serde(with = "utc_datetime")]
+    #[serde(with = "time::serde::rfc3339")]
     /// Time at which the attestation will be added to the event
     pub signing_date: OffsetDateTime,
-    #[serde(with = "utc_datetime")]
+    #[serde(with = "time::serde::rfc3339")]
     /// Date of when the weather observations occured (midnight UTC), all entries must be made before this time
     pub observation_date: OffsetDateTime,
     // NOAA observation stations used in this event
@@ -208,15 +206,14 @@ impl CreateEventData {
 }
 
 /// Validates the received messages was created by the provided pubkey
-pub fn validate(message: Message, pubkey: &str, signature: &str) -> Result<(), anyhow::Error> {
-    debug!("pubkey: {} signature: {}", pubkey, signature);
+pub fn validate(message: Message, pubkey_str: &str, signature: &str) -> Result<(), anyhow::Error> {
+    info!("pubkey: {} signature: {}", pubkey_str, signature);
     let raw_signature: Vec<u8> = hex::decode(signature).unwrap();
-    let raw_pubkey: Vec<u8> = hex::decode(pubkey).unwrap();
     let sig: Signature = Signature::from_slice(raw_signature.as_slice())
         .map_err(|e| anyhow!("invalid signature: {}", e))?;
-    let pubkey: secp256k1::XOnlyPublicKey =
-        secp256k1::XOnlyPublicKey::from_slice(raw_pubkey.as_slice())
-            .map_err(|e| anyhow!("invalid pubkey: {}", e))?;
+    let raw_pubkey: Vec<u8> = hex::decode(pubkey_str).unwrap();
+    let pubkey: XOnlyPublicKey = XOnlyPublicKey::from_slice(raw_pubkey.as_slice())
+        .map_err(|e| anyhow!("invalid pubkey: {}", e))?;
     sig.verify(&message, &pubkey).map_err(|e| {
         anyhow!(
             "invalid signature {} for pubkey {} {}",
@@ -268,9 +265,9 @@ impl Default for EventFilter {
 #[derive(Debug, Clone, Serialize, Deserialize, ToSchema, PartialEq, Eq)]
 pub struct SignEvent {
     pub id: Uuid,
-    #[serde(with = "utc_datetime")]
+    #[serde(with = "time::serde::rfc3339")]
     pub signing_date: OffsetDateTime,
-    #[serde(with = "utc_datetime")]
+    #[serde(with = "time::serde::rfc3339")]
     pub observation_date: OffsetDateTime,
     pub status: EventStatus,
     pub nonce: Scalar,
@@ -355,9 +352,9 @@ impl<'a> TryFrom<&Row<'a>> for SignEvent {
 pub struct ActiveEvent {
     pub id: Uuid,
     pub locations: Vec<String>,
-    #[serde(with = "utc_datetime")]
+    #[serde(with = "time::serde::rfc3339")]
     pub signing_date: OffsetDateTime,
-    #[serde(with = "utc_datetime")]
+    #[serde(with = "time::serde::rfc3339")]
     pub observation_date: OffsetDateTime,
     pub status: EventStatus,
     pub total_allowed_entries: i64,
@@ -491,10 +488,10 @@ impl<'a> TryFrom<&Row<'a>> for ActiveEvent {
 #[derive(Debug, Clone, Serialize, Deserialize, ToSchema, PartialEq, Eq)]
 pub struct EventSummary {
     pub id: Uuid,
-    #[serde(with = "utc_datetime")]
+    #[serde(with = "time::serde::rfc3339")]
     /// Time at which the attestation will be added to the event
     pub signing_date: OffsetDateTime,
-    #[serde(with = "utc_datetime")]
+    #[serde(with = "time::serde::rfc3339")]
     /// Date of when the weather observations occured
     pub observation_date: OffsetDateTime,
     /// NOAA observation stations used in this event
@@ -626,10 +623,10 @@ impl<'a> TryFrom<&Row<'a>> for EventSummary {
 #[derive(Debug, Clone, Serialize, Deserialize, ToSchema, PartialEq, Eq)]
 pub struct Event {
     pub id: Uuid,
-    #[serde(with = "utc_datetime")]
+    #[serde(with = "time::serde::rfc3339")]
     /// Time at which the attestation will be added to the event
     pub signing_date: OffsetDateTime,
-    #[serde(with = "utc_datetime")]
+    #[serde(with = "time::serde::rfc3339")]
     /// Date of when the weather observations occured
     pub observation_date: OffsetDateTime,
     /// NOAA observation stations used in this event
@@ -918,7 +915,7 @@ impl TryInto<Weather> for &OrderedMap<String, Value> {
 
 #[derive(Debug, Clone, Serialize, Deserialize, ToSchema, PartialEq, Eq)]
 pub struct Observed {
-    #[serde(with = "utc_datetime")]
+    #[serde(with = "time::serde::rfc3339")]
     pub date: OffsetDateTime,
     pub temp_low: i64,
     pub temp_high: i64,
@@ -1109,7 +1106,7 @@ impl ToRawSql for Observed {
 
 #[derive(Debug, Clone, Serialize, Deserialize, ToSchema, PartialEq, Eq)]
 pub struct Forecasted {
-    #[serde(with = "utc_datetime")]
+    #[serde(with = "time::serde::rfc3339")]
     pub date: OffsetDateTime,
     pub temp_low: i64,
     pub temp_high: i64,

oracle/src/file_access.rs

@@ -7,13 +7,13 @@ use time::{
 use tokio::fs;
 use utoipa::IntoParams;
 
-use crate::{create_folder, subfolder_exists, utc_option_datetime};
+use crate::{create_folder, subfolder_exists};
 
 #[derive(Clone, Deserialize, Serialize, IntoParams)]
 pub struct FileParams {
-    #[serde(with = "utc_option_datetime")]
+    #[serde(with = "time::serde::rfc3339::option")]
     pub start: Option<OffsetDateTime>,
-    #[serde(with = "utc_option_datetime")]
+    #[serde(with = "time::serde::rfc3339::option")]
     pub end: Option<OffsetDateTime>,
     pub observations: Option<bool>,
     pub forecasts: Option<bool>,

oracle/src/lib.rs

@@ -3,14 +3,12 @@ mod db;
 mod file_access;
 pub mod oracle;
 pub mod routes;
-mod ser;
 mod startup;
 mod utils;
 
 pub use app_error::AppError;
 pub use db::*;
 pub use file_access::{drop_suffix, Error, FileAccess, FileData, FileParams};
 pub use routes::*;
-pub use ser::*;
 pub use startup::*;
 pub use utils::*;

oracle/src/routes/stations/weather_routes.rs

@@ -9,7 +9,7 @@ use serde::Serialize;
 use time::OffsetDateTime;
 use utoipa::IntoParams;
 
-use crate::{utc_option_datetime, AppError, AppState, FileParams, Forecast, Observation, Station};
+use crate::{AppError, AppState, FileParams, Forecast, Observation, Station};
 
 #[utoipa::path(
     get,
@@ -36,10 +36,10 @@ pub async fn forecasts(
 
 #[derive(Clone, Serialize, Deserialize, IntoParams)]
 pub struct ForecastRequest {
-    #[serde(with = "utc_option_datetime")]
+    #[serde(with = "time::serde::rfc3339::option")]
     #[serde(default)]
     pub start: Option<OffsetDateTime>,
-    #[serde(with = "utc_option_datetime")]
+    #[serde(with = "time::serde::rfc3339::option")]
     #[serde(default)]
     pub end: Option<OffsetDateTime>,
     pub station_ids: String,
@@ -67,10 +67,10 @@ impl From<&ForecastRequest> for FileParams {
 
 #[derive(Clone, Serialize, Deserialize, IntoParams)]
 pub struct ObservationRequest {
-    #[serde(with = "utc_option_datetime")]
+    #[serde(with = "time::serde::rfc3339::option")]
     #[serde(default)]
     pub start: Option<OffsetDateTime>,
-    #[serde(with = "utc_option_datetime")]
+    #[serde(with = "time::serde::rfc3339::option")]
     #[serde(default)]
     pub end: Option<OffsetDateTime>,
     pub station_ids: String,

oracle/tests/api/create_event.rs

@@ -31,6 +31,7 @@ async fn can_create_oracle_event() {
         total_allowed_entries: 100,
         number_of_places_win: 3,
         number_of_values_per_entry: 6,
+        coordinator: None,
     };
     let body_json = to_string(&new_event).unwrap();
     let request = Request::builder()
@@ -89,6 +90,7 @@ async fn can_create_and_get_oracle_event() {
         total_allowed_entries: 100,
         number_of_places_win: 3,
         number_of_values_per_entry: 6,
+        coordinator: None,
     };
     let body_json = to_string(&new_event).unwrap();
     let request_post = Request::builder()

oracle/tests/api/create_event_entry.rs

@@ -29,6 +29,7 @@ async fn can_create_entry_into_event() {
         total_allowed_entries: 100,
         number_of_places_win: 3,
         number_of_values_per_entry: 6,
+        coordinator: None,
     };
     let oracle_event = test_app.oracle.create_event(new_event).await.unwrap();
     let new_entry = AddEventEntry {
@@ -54,6 +55,7 @@ async fn can_create_entry_into_event() {
                 wind_speed: None,
             },
         ],
+        coordinator: None,
     };
     let body_json = to_string(&new_entry).unwrap();
     let request = Request::builder()
@@ -94,6 +96,7 @@ async fn can_create_and_get_event_entry() {
         total_allowed_entries: 100,
         number_of_places_win: 3,
         number_of_values_per_entry: 6,
+        coordinator: None,
     };
     let oracle_event = test_app.oracle.create_event(new_event).await.unwrap();
     let new_entry = AddEventEntry {
@@ -119,6 +122,7 @@ async fn can_create_and_get_event_entry() {
                 wind_speed: None,
             },
         ],
+        coordinator: None,
     };
     let body_json = to_string(&new_entry).unwrap();
     let request = Request::builder()