nostr: fix NIP-47 list_transactions response deserialization when null expires_at

Closes #469

Signed-off-by: Yuki Kishimoto <[email protected]>

Author: lnbc1QWFyb24

CHANGELOG.md

@@ -42,7 +42,7 @@
 
 ### Fixed
 
-* nostr: fix NIP-47 `list_transactions` response deserialization ([Yuki Kishimoto])
+* nostr: fix NIP-47 `list_transactions` response deserialization ([Yuki Kishimoto] and [lnbc1QWFyb24])
 
 ### Removed
 
@@ -291,6 +291,7 @@ added `nostrdb` storage backend, added NIP32 and completed NIP51 support and mor
 [benthecarman]: https://github.com/benthecarman
 [Xiao Yu]: https://github.com/kasugamirai
 [RydalWater]: https://github.com/RydalWater
+[lnbc1QWFyb24]: https://github.com/lnbc1QWFyb24
 
 <!-- Tags -->
 [Unreleased]: https://github.com/rust-nostr/nostr/compare/v0.32.0...HEAD

bindings/nostr-ffi/src/nips/nip47.rs

@@ -653,7 +653,7 @@ pub struct LookupInvoiceResponseResult {
     /// Creation timestamp in seconds since epoch
     pub created_at: Arc<Timestamp>,
     /// Expiration timestamp in seconds since epoch
-    pub expires_at: Arc<Timestamp>,
+    pub expires_at: Option<Arc<Timestamp>>,
     /// Settled timestamp in seconds since epoch
     pub settled_at: Option<Arc<Timestamp>>,
     /// Optional metadata about the payment
@@ -672,7 +672,7 @@ impl From<nip47::LookupInvoiceResponseResult> for LookupInvoiceResponseResult {
             amount: value.amount,
             fees_paid: value.fees_paid,
             created_at: Arc::new(value.created_at.into()),
-            expires_at: Arc::new(value.expires_at.into()),
+            expires_at: value.expires_at.map(|t| Arc::new(t.into())),
             settled_at: value.settled_at.map(|t| Arc::new(t.into())),
             metadata: value.metadata.and_then(|m| m.try_into().ok()),
         }
@@ -691,7 +691,7 @@ impl From<LookupInvoiceResponseResult> for nip47::LookupInvoiceResponseResult {
             amount: value.amount,
             fees_paid: value.fees_paid,
             created_at: **value.created_at,
-            expires_at: **value.expires_at,
+            expires_at: value.expires_at.map(|t| **t),
             settled_at: value.settled_at.map(|t| **t),
             metadata: value.metadata.and_then(|m| m.try_into().ok()),
         }

bindings/nostr-js/src/nips/nip47.rs

@@ -467,7 +467,7 @@ pub struct JsLookupInvoiceResponseResult {
     /// Creation timestamp in seconds since epoch
     pub created_at: JsTimestamp,
     /// Expiration timestamp in seconds since epoch
-    pub expires_at: JsTimestamp,
+    pub expires_at: Option<JsTimestamp>,
     /// Settled timestamp in seconds since epoch
     pub settled_at: Option<JsTimestamp>,
     // /// Optional metadata about the payment
@@ -487,7 +487,7 @@ impl From<LookupInvoiceResponseResult> for JsLookupInvoiceResponseResult {
             amount: value.amount,
             fees_paid: value.fees_paid,
             created_at: value.created_at.into(),
-            expires_at: value.expires_at.into(),
+            expires_at: value.expires_at.map(|t| t.into()),
             settled_at: value.settled_at.map(|t| t.into()),
             // metadata: value.metadata.to_string(),
         }
@@ -506,7 +506,7 @@ impl From<JsLookupInvoiceResponseResult> for LookupInvoiceResponseResult {
             amount: value.amount,
             fees_paid: value.fees_paid,
             created_at: *value.created_at,
-            expires_at: *value.expires_at,
+            expires_at: value.expires_at.map(|t| *t),
             settled_at: value.settled_at.map(|t| *t),
             metadata: None,
         }

crates/nostr/src/nips/nip47.rs

@@ -586,7 +586,8 @@ pub struct LookupInvoiceResponseResult {
     /// Creation timestamp in seconds since epoch
     pub created_at: Timestamp,
     /// Expiration timestamp in seconds since epoch
-    pub expires_at: Timestamp,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub expires_at: Option<Timestamp>,
     /// Settled timestamp in seconds since epoch
     #[serde(skip_serializing_if = "Option::is_none")]
     pub settled_at: Option<Timestamp>,
@@ -1101,7 +1102,7 @@ mod tests {
                     amount: 123,
                     fees_paid: 1,
                     created_at: Timestamp::from(123456),
-                    expires_at: Timestamp::from(1234567),
+                    expires_at: Some(Timestamp::from(1234567)),
                     description_hash: None,
                     payment_hash: String::new(),
                     metadata: None,